diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp
index 5e99ca7fe..16ff93559 100644
--- a/uppsrc/Core/App.cpp
+++ b/uppsrc/Core/App.cpp
@@ -719,6 +719,9 @@ String GetUserName()
 	::GetUserNameW(temp, &w);
 	return temp;
 #else
+	char user[1000];
+	if(getlogin_r(user, 999))
+		return user;
 	return Nvl(GetEnv("USER"), "root");
 #endif
 }