diff --git a/js/gdm/util.js b/js/gdm/util.js
index 97df6d687..5301b5258 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -641,7 +641,10 @@ export class ShellUserVerifier extends Signals.EventEmitter {
     }
 
     _getDetectedDefaultService() {
-        if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
+        if (this._smartcardManager.loggedInWithToken() &&
+            this._smartcardManager.lockOnRemoval())
+           return SMARTCARD_SERVICE_NAME;
+        else if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
             return PASSWORD_SERVICE_NAME;
         else if (this._smartcardManager)
             return SMARTCARD_SERVICE_NAME;