diff --git a/internal/ui/login/static/templates/select_user.html b/internal/ui/login/static/templates/select_user.html
index eaa9f64b7ea..d65ad515dd4 100644
--- a/internal/ui/login/static/templates/select_user.html
+++ b/internal/ui/login/static/templates/select_user.html
@@ -24,8 +24,10 @@ <h1>{{t "SelectAccount.Title"}}</h1>
     <div class="lgn-account-selection">
         {{ if .Users }}
         {{ $displayLoginNameSuffix := and .OrgID (not .DisplayLoginNameSuffix)}}
+        {{ $orgName := .OrgName }}
         {{ range $user := .Users }}
         {{ $sessionState := (printf "SelectAccount.SessionState%v" $user.UserSessionState) }}
+        {{if $user.SelectionPossible}}
         <button type="submit" name="userID" value="{{$user.UserID}}" class="lgn-account" 
         {{if not $user.SelectionPossible}}disabled title="{{t "Errors.User.NotAllowedOrg"}}"{{end}}>
             <div class="left">
@@ -47,6 +49,7 @@ <h1>{{t "SelectAccount.Title"}}</h1>
         </button>
         {{ end }}
         {{ end }}
+        {{ end }}
         <button type="submit" name="userID" value="0" class="lgn-account">
             <div class="left">
                 <div class="lgn-avatar transparent">