diff --git a/resources/views/v1/auth/login.twig b/resources/views/v1/auth/login.twig
index 109e53f734..3a7b336631 100644
--- a/resources/views/v1/auth/login.twig
+++ b/resources/views/v1/auth/login.twig
@@ -22,13 +22,14 @@
         </div>
     {% endif %}
 
-    {% if errors.has('email') %}
+
+    {% if errors.count > 0 %}
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-danger alert-dismissible" role="alert">
                     <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
-                    <strong>{{ 'flash_error'|_ }}</strong> {{ errors.get('email')[0] }}
+                    <strong>{{ 'flash_error'|_ }}</strong> {{ errors.first }}
                 </div>
             </div>
         </div>
@@ -46,6 +47,17 @@
         </div>
     {% endif %}
 
+    {# LDAP warning #}
+    {% if ldapWarning %}
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="alert alert-danger alert-dismissible" role="alert">
+                <a target="_blank" href="https://docs.firefly-iii.org/firefly-iii/advanced-installation/authentication/#ldap">Please upgrade LDAP configuration</a>
+            </div>
+        </div>
+    </div>
+    {% endif %}
+
     <div class="login-box-body">
         <p class="login-box-msg">{{ 'sign_in_to_start'|_ }}</p>
 
@@ -53,10 +65,10 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
             <div class="form-group has-feedback">
-                {% if config('firefly.login_provider') == 'eloquent' %}
+                {% if config('firefly.authentication_guard') == 'web' %}
                     <input type="email" autocomplete="email" name="email" value="{% if not IS_DEMO_SITE %}{{ email }}{% else %}{{ DEMO_USERNAME }}{% endif %}" class="form-control" placeholder="{{ trans('form.email') }}"/>
                 {% else %}
-                    <input type="text" autocomplete="username" name="email" value="{{ email }}" class="form-control" placeholder="{{ trans('form.login_name') }}"/>
+                    <input type="text" autocomplete="username" name="{{ usernameField }}" value="{{ email }}" class="form-control" placeholder="{{ trans('form.login_name') }}"/>
                 {% endif %}
             </div>
             <div class="form-group has-feedback">