diff --git a/core/admin/mailu/sso/views/base.py b/core/admin/mailu/sso/views/base.py
index 067ea809..73552475 100644
--- a/core/admin/mailu/sso/views/base.py
+++ b/core/admin/mailu/sso/views/base.py
@@ -11,28 +11,13 @@ def login():
     form = forms.LoginForm()
     endpoint = flask.request.args.get('next', 'ui.index')
 
-    if (
-        str(app.config["WEBMAIL"]).upper() != "NONE"
-        and str(app.config["ADMIN"]).upper() != "FALSE"
-        and endpoint != "ui.webmail"
-    ):
-        form.target.choices = [("Admin", "Admin"), ("Webmail", "Webmail")]
-    elif (
-        str(app.config["WEBMAIL"]).upper() != "NONE"
-        and str(app.config["ADMIN"]).upper() != "FALSE"
-        and endpoint == "ui.webmail"
-    ):
-        form.target.choices = [("Webmail", "Webmail"), ("Admin", "Admin")]
-    elif (
-        str(app.config["WEBMAIL"]).upper() != "NONE"
-        and str(app.config["ADMIN"]).upper() == "FALSE"
-    ):
-        form.target.choices = [("Webmail", "Webmail")]
-    elif (
-        str(app.config["WEBMAIL"]).upper() == "NONE"
-        and str(app.config["ADMIN"]).upper() != "FALSE"
-    ):
-        form.target.choices = [("Admin", "Admin")]
+    form.target.choices = []
+    if str(app.config["ADMIN"]).upper() != "FALSE":
+        form.target.choices += [("Admin", "Admin")]
+    if str(app.config["WEBMAIL"]).upper() != "NONE":
+        form.target.choices += [("Webmail", "Webmail")]
+    if endpoint == "ui.webmail":
+        form.target.choices.reverse()
 
     if form.validate_on_submit():
         if str(form.target.data) == 'Admin':