diff --git a/awit-ssh b/awit-ssh
index 4fb35275f01bbd7d76ea93c777c53ff45c51cc2e..fecc5ba9574962905d892e411bb2bd50327828ea 100755
--- a/awit-ssh
+++ b/awit-ssh
@@ -149,6 +149,7 @@ if ($mesg->code()) {
 
 # Some flags we may need
 my $needDSS;
+my $loginUsername;
 
 
 # If no matches
@@ -188,6 +189,12 @@ if ($ldapEntry) {
 		$port = $ldapLoginPort;
 	}
 
+	# Check if we need to set the username
+	if (my $ldapLoginUsername = $ldapEntry->get_value('awitLoginUsername')) {
+		logger('INFO',"  - Username %s (awitLoginUsername)",$ldapLoginUsername);
+		$loginUsername = $ldapLoginUsername;
+	}
+
 	# Check if we have a description
 	if (my $ldapDescription = $ldapEntry->get_value('description')) {
 		logger('INFO',"Description");
@@ -223,6 +230,11 @@ if (defined($port)) {
 	push(@sshArgs,'-p',$port);
 }
 
+# Check if we have a different username defined to login as
+if (defined($loginUsername)) {
+	push(@sshArgs,'-l',$loginUsername);
+}
+
 # If the server is ancient, we need to enable DSS
 if (defined($needDSS)) {
 	push(@sshArgs,'-o','PubkeyAcceptedKeyTypes=+ssh-dss');