diff --git a/profile b/profile
index 5190ced..e1e7673 100755
--- a/profile
+++ b/profile
@@ -88,6 +88,12 @@ then
     TERM=screen-256color
 fi
 
+if test '!' -v USER -a -v USERNAME
+then
+    export USER=$USERNAME
+fi
+
+
 # set TMP, TEMP, TMPDIR
 
 if test -z "$TMP"
diff --git a/shrc b/shrc
index b6d9f09..b77a32c 100755
--- a/shrc
+++ b/shrc
@@ -71,10 +71,6 @@ else
     return
 fi
 
-if $iswindows
-then
-    export USER=$USERNAME
-fi
 $ismsys && export HOSTNAME
 
 # adhoc fix for ansible on cygwin