--- RDP.back	2014-01-08 16:54:31.466144043 +0100
+++ RDP	2014-01-09 13:22:24.713157133 +0100
@@ -50,6 +50,14 @@
     exit
 }
 
+function already_joined {
+  if [ -n "$ldap_base" ] && [ -n "$rdp_domainname" ] &&  [ -n "$rdp_server" ]; then
+    joined="true"
+  else
+    joined="false"
+  fi
+}
+
 eval "$(/usr/sbin/univention-config-registry shell)"
 
 params=(-f)
@@ -72,11 +80,6 @@
 	params+=(--ignore-certificate)
 fi
 
-if test -e /tmp/password-store-$USER; then
-    PASSWD=`cat /tmp/password-store-$USER | base64 --decode`
-    params+=(-p "$PASSWD")
-fi
-
 if [ -n "$rdp_keyboard" ]; then
     params+=(-k "$rdp_keyboard")
 else
@@ -100,10 +103,21 @@
 
 if [ -n "$rdp_user" ]; then
     params+=(-u "$rdp_user")
+    if test -e /tmp/password-store-$USER; then
+      PASSWD=`cat /tmp/password-store-$USER | base64 --decode`
+      params+=(-p "$PASSWD")
+    fi
+
 else
 
-if [[ $USER == guest-* ]]; then
-	messageFile=$(mktemp)
+joined="false"
+  if [[ $USER == guest-* ]]; then
+    already_joined
+    if [[ $joined == true ]]; then
+      echo "Disabling NLA validation"
+      params+=(--no-nla)
+    else
+      messageFile=$(mktemp)
 	echo "
 You're currently logged in with a guest user account. This usually means
 that the UCC system hasn't been joined into the UCS domain yet.
@@ -122,9 +136,14 @@
 " >>$messageFile
 	xmessage -file "$messageFile"
 	/usr/bin/startlxde
-else
+    fi
+  else
     params+=(-u "$USER")
-	fi
+    if test -e /tmp/password-store-$USER; then
+      PASSWD=`cat /tmp/password-store-$USER | base64 --decode`
+      params+=(-p "$PASSWD")
+    fi
+  fi
 fi
 
 if [ -n "$rdp_domainname" ]; then