diff --git a/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs b/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs
index ac249de..9a14f18 100644
--- a/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs
+++ b/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs
@@ -42,8 +42,10 @@ protected override void ExecuteInternal()
             if (!Constant.OS_WINDOWS) throw new Exception("This function is only supported on Windows clients");
             host = GetArgParameterOrConfigRequired("host", "h");
             port = GetArgParameterOrConfigInt("port", "o", Ldap.LDAP_PORT).ToString().ToUShort();
-            username = GetArgParameterOrConfig("username", "u");
-            password = GetArgParameterOrConfig("password", "p");
+            username = GetArgParameterOrConfig("username", "u").TrimOrNull();
+            if (username != null) password = GetArgParameterOrConfigRequired("password", "p");
+            else GetArgParameterOrConfig("password", "p");
+
             domainName = GetArgParameterOrConfig("domainName", "d");
 
             using (var ad = GetActiveDirectory())