diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 79b67f6d..2aa8ade5 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -717,7 +717,10 @@ namespace Novell.CASA.GUI
 
         private string GetLocalUsername()
         {
-            return Environment.GetEnvironmentVariable("USERNAME");                    
+	    if (Common.IS_LINUX)
+            	return Environment.GetEnvironmentVariable("USER");                    
+	    else
+            	return Environment.GetEnvironmentVariable("USERNAME");                    
         }