diff --git a/awit-ssh b/awit-ssh
index 6afd189ca79cb51183a20abe8451f5aabedd2462..c0d34a858f3d3e2f9c10e3a9472b4ec2d5f8263e 100755
--- a/awit-ssh
+++ b/awit-ssh
@@ -54,7 +54,7 @@ use User::pwent;
 
 
 my $NAME = "AWIT-SSH-Client";
-our $VERSION = "0.8.1";
+our $VERSION = "0.8.2";
 
 
 print(STDERR "$NAME v$VERSION - Copyright (c) 2016, AllWorldIT\n\n");
@@ -70,6 +70,9 @@ GetOptions(\%optctl,
 	# TODO: debug is not implemented, make sure displayHelp is updated
 	"debug",
 
+	# TODO: Improve globbing before adding it to displayHelp
+	"globbing",
+
 	"knock=s",
 
 	"rsync",
@@ -410,6 +413,9 @@ PFEC1:
 	}
 
 	# Check if we need to set the host
+	if (defined($optctl{'globbing'})) {
+		$loginHost = $ldapEntryName;
+	}
 	if (my $ldapLoginHost = $ldapEntry->get_value('awitLoginHost')) {
 		logger('INFO',"  - Host ".color('green')."%s".color('reset')." (awitLoginHost)",$ldapLoginHost);
 		$loginHost = $ldapLoginHost;