diff --git a/packages/hydrooj/src/handler/user.ts b/packages/hydrooj/src/handler/user.ts
index 790fdb733..91ea0676f 100644
--- a/packages/hydrooj/src/handler/user.ts
+++ b/packages/hydrooj/src/handler/user.ts
@@ -29,9 +29,11 @@ import {
 
 class UserLoginHandler extends Handler {
     noCheckPermView = true;
+    async prepare() {
+        if (!system.get('server.login')) throw new BuiltinLoginError();
+    }
 
     async get() {
-        if (!system.get('server.login')) throw new BuiltinLoginError();
         this.response.template = 'user_login.html';
     }
 
@@ -45,7 +47,6 @@ class UserLoginHandler extends Handler {
         domainId: string, uname: string, password: string, rememberme = false, redirect = '',
         tfa = '', authnChallenge = '',
     ) {
-        if (!system.get('server.login')) throw new BuiltinLoginError();
         let udoc = await user.getByEmail(domainId, uname);
         udoc ||= await user.getByUname(domainId, uname);
         if (!udoc) throw new UserNotFoundError(uname);
@@ -191,6 +192,9 @@ class UserLogoutHandler extends Handler {
 
 export class UserRegisterHandler extends Handler {
     noCheckPermView = true;
+    async prepare() {
+        if (!system.get('server.login')) throw new BuiltinLoginError();
+    }
 
     async get() {
         this.response.template = 'user_register.html';
diff --git a/packages/ui-default/components/signin/signin_dialog.page.styl b/packages/ui-default/components/signin/signin_dialog.page.styl
index bdf576073..74c78da70 100644
--- a/packages/ui-default/components/signin/signin_dialog.page.styl
+++ b/packages/ui-default/components/signin/signin_dialog.page.styl
@@ -22,6 +22,9 @@ $signin_dialog_expand_h = 30px
   position: relative
   z-index: 2
   box-shadow: 0 0 30px rgba(#000, 0.6)
+  
+.dialog--signin .dialog--signin__main:first-child
+  margin-right: 0
 
 .dialog--signin__side
   position: absolute
diff --git a/packages/ui-default/templates/partials/login_dialog.html b/packages/ui-default/templates/partials/login_dialog.html
index 5d5be1461..2ecb04545 100644
--- a/packages/ui-default/templates/partials/login_dialog.html
+++ b/packages/ui-default/templates/partials/login_dialog.html
@@ -1,5 +1,6 @@
 <div class="dialog dialog--signin" style="display:none">
   <div class="dialog__content">
+    {% if model.system.get('server.login') %}
     <div class="dialog--signin__bg">
       <div class="dialog--signin__side">
         <h1>{{ _("Don't have an account?") }}</h1>
@@ -9,6 +10,7 @@
         {% endif %}
       </div>
     </div>
+    {% endif %}
     <div class="dialog--signin__main">
       <form action="{{ url('user_login') }}" method="post">
         <div class="dialog--signin__close-container supplementary">
diff --git a/packages/ui-default/templates/partials/nav.html b/packages/ui-default/templates/partials/nav.html
index 4fa67c793..cd241d190 100644
--- a/packages/ui-default/templates/partials/nav.html
+++ b/packages/ui-default/templates/partials/nav.html
@@ -19,7 +19,7 @@
     <ol class="nav__list nav__list--secondary clearfix">
     {% if not handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
       <li class="nav__list-item"><a href="{{ url('user_login') }}" class="nav__item" name="nav_login">{{ _('Login') }}</a></li>
-      {% if handler.user.hasPriv(PRIV.PRIV_REGISTER_USER) %}
+      {% if handler.user.hasPriv(PRIV.PRIV_REGISTER_USER) and model.system.get('server.login') %}
       <li class="nav__list-item"><a href="{{ url('user_register') }}" class="nav__item--round">{{ _('Sign Up') }}</a></li>
       {% endif %}
       <li class="nav__list-item nojs--hide" data-dropdown-pos="bottom right" data-dropdown-custom-class="nav__dropdown" data-dropdown-target="#menu-nav-user" data-dropdown-disabledconstrainToWindow data-dropdown-trigger-desktop-only>