diff --git a/ChangeLog b/ChangeLog
index cf3fa2e6b..2f8d23abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-08  Alex Roitman  <shura@gramps-project.org>
+	* src/GrampsDb/_GrampsDBDir.py (write_lock_file): Work around
+	os.getlogin() problem on some terminals.
+
 2007-07-07  Don Allingham  <don@gramps-project.org>
 	* src/PageView.py (ListView.column_clicked): set the search column for list
 	views to be the sort column
diff --git a/NEWS b/NEWS
index 82ba07bb2..d86716cd8 100644
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,8 @@ Version 3.0.0 -- the "" release
 * Multiple notes
 * LDS temple definitions moved to supporting file
 * New database format, using hidden directory, old grdb format deprecated
-* New database manager, allowing create, deletion, renaming, repair and revison 
-  control
+* New database manager, allowing create, deletion, renaming, repair and
+  revison control
 
 Version 2.2.6 -- the "Summarize Proust Competition" release
 * Fix report option saving
diff --git a/src/GrampsDb/_GrampsDBDir.py b/src/GrampsDb/_GrampsDBDir.py
index a63fe950b..b39971a6c 100644
--- a/src/GrampsDb/_GrampsDBDir.py
+++ b/src/GrampsDb/_GrampsDBDir.py
@@ -1741,7 +1741,11 @@ def write_lock_file(name):
     else:
         import pwd
         host = os.uname()[1]
-        user = os.getlogin()
+        # An ugly workaround for os.getlogin() issue with Konsole
+        try:
+            user = os.getlogin()
+        except:
+            user = os.environ.get('USER')
         text = "%s@%s" % (user, host)
     f.write(_("Locked by %s") % text)
     f.close()