diff --git a/client/SDL/dialogs/sdl_dialogs.cpp b/client/SDL/dialogs/sdl_dialogs.cpp
index 1e59d49ea..32f845763 100644
--- a/client/SDL/dialogs/sdl_dialogs.cpp
+++ b/client/SDL/dialogs/sdl_dialogs.cpp
@@ -598,8 +598,13 @@ BOOL sdl_auth_dialog_show(const SDL_UserAuthArg* args)
 	if (rc > 0)
 	{
 		user = _strdup(result[0].c_str());
-		domain = _strdup(result[1].c_str());
-		pwd = _strdup(result[2].c_str());
+		if (args->result == AUTH_SMARTCARD_PIN)
+			pwd = _strdup(result[1].c_str());
+		else
+		{
+			domain = _strdup(result[1].c_str());
+			pwd = _strdup(result[2].c_str());
+		}
 	}
 	return sdl_push_user_event(SDL_USEREVENT_AUTH_RESULT, user, domain, pwd, rc);
 }