diff --git a/sf-launcher b/sf-launcher
index cae6a56..a5d1be7 100755
--- a/sf-launcher
+++ b/sf-launcher
@@ -1,8 +1,10 @@
 #!/bin/bash
+
 if [ -z "$1" ]
 then
-	USER=$(zenity --entry --text="Enter user name for sf-laucher")
+	USER=$(zenity --entry --text="Enter user name for sf-laucher" 2>/dev/null)
 else
 	USER=$1
 fi
-ssh -J $1@sf-gw $1@sf-lca launcher
+
+ssh -J $USER@sf-gw $USER@sf-lca launcher
diff --git a/undulator-pointing b/undulator-pointing
index 5c47497..f7d46af 100755
--- a/undulator-pointing
+++ b/undulator-pointing
@@ -1,8 +1,8 @@
 #!/bin/bash
 if [ -z "$1" ]
 then
-	USER=$(zenity --entry --text="Enter user name for sf-laucher")
+	USER=$(zenity --entry --text="Enter user name for undulator pointing control" 2> /dev/null)
 else
 	USER=$1
 fi
-ssh -J $1@sf-gw $1@sf-lca "cd /sf/bd/applications/UndulatorOrbit/current; bash runUndulatorOrbit.sh"
+ssh -J $USER@sf-gw $USER@sf-lca "cd /sf/bd/applications/UndulatorOrbit/current; bash runUndulatorOrbit.sh"