diff --git a/android-client/web/app.html b/android-client/web/app.html
index ef5bce3..a6d5c09 100644
--- a/android-client/web/app.html
+++ b/android-client/web/app.html
@@ -1657,7 +1657,10 @@ var unlockMode = 'none', canDeviceLock = false, hasContainer = false;
 function syncUnlockUi() {
   ['device', 'code', 'password'].forEach(function (m) {
     var id = { device: 'sModeDevice', code: 'sModeCode', password: 'sModePwd' }[m];
-    document.getElementById(id).classList.toggle('main', unlockMode === m);
+    var b = document.getElementById(id), on = unlockMode === m;
+    if (!b.dataset.label) b.dataset.label = b.textContent;
+    b.textContent = (on ? String.fromCharCode(0x2713) + '  ' : '') + b.dataset.label;
+    b.classList.toggle('main', on);
   });
   document.getElementById('sModeDevice').style.opacity = canDeviceLock ? 1 : .4;
   document.getElementById('sModeNote').textContent =
diff --git a/mainApk.pas b/mainApk.pas
index d1f4112..0a05ef8 100644
--- a/mainApk.pas
+++ b/mainApk.pas
@@ -3099,6 +3099,7 @@ end;
 procedure TForm8.PushUnlockMode;
 var
   LMode: string;
+  LCan: Boolean;
 begin
   if VaultNeedsPin then
   begin
@@ -3111,8 +3112,11 @@ begin
     LMode := 'device'
   else
     LMode := 'none';
+  LCan := BiometricAvailable;
+  Log(Format('Unlock mode: %s, screen lock usable: %s %s',
+    [LMode, BoolToStr(LCan, True), LastBiometricError]));
   WebCall(Format('PM.setUnlockMode("%s", %s, %s)',
-    [LMode, LowerCase(BoolToStr(BiometricAvailable, True)),
+    [LMode, LowerCase(BoolToStr(LCan, True)),
      LowerCase(BoolToStr(HasLocalContainer, True))]));
 end;