diff --git a/src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp b/src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp
index 4752fb86dd..c6fa7c6cd8 100644
--- a/src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp
+++ b/src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp
@@ -1,8 +1,11 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #include <NodeMonitor.h>
 #include <OS.h>
 #include <Roster.h>
diff --git a/src/add-ons/input_server/filters/screensaver/SSInputFilter.h b/src/add-ons/input_server/filters/screensaver/SSInputFilter.h
index 36caf391bc..c2da063601 100644
--- a/src/add-ons/input_server/filters/screensaver/SSInputFilter.h
+++ b/src/add-ons/input_server/filters/screensaver/SSInputFilter.h
@@ -1,6 +1,10 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
 
 #include <InputServerFilter.h>
diff --git a/src/bin/screen_blanker/PasswordWindow.cpp b/src/bin/screen_blanker/PasswordWindow.cpp
index 0d010eebab..06b1ac42ce 100644
--- a/src/bin/screen_blanker/PasswordWindow.cpp
+++ b/src/bin/screen_blanker/PasswordWindow.cpp
@@ -1,8 +1,11 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #include <Application.h>
 #include <Screen.h>
 #include <StringView.h>
diff --git a/src/bin/screen_blanker/PasswordWindow.h b/src/bin/screen_blanker/PasswordWindow.h
index c3d1393875..be8c03fb73 100644
--- a/src/bin/screen_blanker/PasswordWindow.h
+++ b/src/bin/screen_blanker/PasswordWindow.h
@@ -1,7 +1,12 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
+
 #ifndef PASSWORDWINDOW_H
 #define PASSWORDWINDOW_H
 
diff --git a/src/bin/screen_blanker/SSAwindow.cpp b/src/bin/screen_blanker/SSAwindow.cpp
index 57f3f36ce6..3a4e98aec4 100644
--- a/src/bin/screen_blanker/SSAwindow.cpp
+++ b/src/bin/screen_blanker/SSAwindow.cpp
@@ -1,8 +1,11 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #include "SSAwindow.h"
 #include <View.h>
 
diff --git a/src/bin/screen_blanker/ScreenSaverApp.cpp b/src/bin/screen_blanker/ScreenSaverApp.cpp
index 156869394f..4db78e5e15 100755
--- a/src/bin/screen_blanker/ScreenSaverApp.cpp
+++ b/src/bin/screen_blanker/ScreenSaverApp.cpp
@@ -1,8 +1,11 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #include <Debug.h>
 #include <stdio.h>
 #include <Screen.h>
@@ -127,7 +130,7 @@ ScreenSaverApp::MessageReceived(BMessage *message)
 bool 
 ScreenSaverApp::QuitRequested()
 {
-	if (fPref.LockEnable() && (system_time()-fBlankTime > fPref.PasswordTime())) {
+	if (fPref.LockEnable() && (system_time()-fBlankTime > (fPref.PasswordTime()-fPref.BlankTime()))) {
 		ShowPW();
 		return false;
 	} else
diff --git a/src/bin/screen_blanker/ScreenSaverApp.h b/src/bin/screen_blanker/ScreenSaverApp.h
index dad9d9806c..8324c655ce 100755
--- a/src/bin/screen_blanker/ScreenSaverApp.h
+++ b/src/bin/screen_blanker/ScreenSaverApp.h
@@ -1,6 +1,10 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
 
 #ifndef SCREEN_SAVER_APP_H
@@ -30,7 +34,7 @@ private:
 	PasswordWindow *fPww;
 
 	thread_id fThreadID;
-	uint32 fBlankTime;
+	bigtime_t fBlankTime;
 	BMessageRunner *fRunner;
 
 	void Shutdown();
diff --git a/src/kits/screensaver/ScreenSaverPrefs.cpp b/src/kits/screensaver/ScreenSaverPrefs.cpp
index 50b37f59f2..8b1e439153 100644
--- a/src/kits/screensaver/ScreenSaverPrefs.cpp
+++ b/src/kits/screensaver/ScreenSaverPrefs.cpp
@@ -1,9 +1,11 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
- * Copyright 2005, Jérôme Duval. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #include <Debug.h>
 #include <File.h>
 #include <FindDirectory.h>
diff --git a/src/kits/screensaver/ScreenSaverThread.cpp b/src/kits/screensaver/ScreenSaverThread.cpp
index 9f85bd2376..c44c55a762 100644
--- a/src/kits/screensaver/ScreenSaverThread.cpp
+++ b/src/kits/screensaver/ScreenSaverThread.cpp
@@ -1,9 +1,11 @@
 /*
- * Copyright 2003, Michael Phipps. All rights reserved.
- * Copyright 2005, Jérôme Duval. All rights reserved.
+ * Copyright 2003-2005, Haiku.
  * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Phipps
+ *		Jérôme Duval, jerome.duval@free.fr
  */
-
 #include <Screen.h>
 #include <ScreenSaver.h>
 #include <FindDirectory.h>