diff --git a/oidc-auth-tools/oidcauthtools/oidcauthtools/oidc_auth.py b/oidc-auth-tools/oidcauthtools/oidcauthtools/oidc_auth.py
index 0eab0b7..37251e5 100644
--- a/oidc-auth-tools/oidcauthtools/oidcauthtools/oidc_auth.py
+++ b/oidc-auth-tools/oidcauthtools/oidcauthtools/oidc_auth.py
@@ -254,6 +254,9 @@ Please use (-u) option to specify the username without the WAD domain
         print("Login succeeded.")
         idToken = node.text
 
+    if match_wad_user:
+        username = getpass.getuser()
+
     print("Updating kubectl config ...")
     updateCredsCmd = ("kubectl config set-credentials " +
                       username + " --token " + idToken)