diff --git a/server/src/uds/core/util/FileStorage.py b/server/src/uds/core/util/FileStorage.py
index 15bd1c3bb..b35f70ab7 100644
--- a/server/src/uds/core/util/FileStorage.py
+++ b/server/src/uds/core/util/FileStorage.py
@@ -64,6 +64,8 @@ class FileStorage(Storage):
 
         self.cache = cache
 
+        self.cache._cache.flush_all()  # On start, ensures that cache is empty to avoid surprises
+
         Storage.__init__(self, *args, **kwargs)
 
 
@@ -151,8 +153,9 @@ class FileStorage(Storage):
         self._removeFromCache(name)
 
     def exists(self, name):
+        logger.debug('Called exists for {}')
         try:
-            self._dbFileForReadOnly(name)
+            self._dbFileForReadOnly(name).uuid
             return True
         except DBFile.DoesNotExist:
             return False
diff --git a/server/src/uds/templates/uds/html5/login.html b/server/src/uds/templates/uds/html5/login.html
index 5e8af3375..86b04eae6 100644
--- a/server/src/uds/templates/uds/html5/login.html
+++ b/server/src/uds/templates/uds/html5/login.html
@@ -83,6 +83,8 @@
 											{% endfor %}
 									  </select>
 								</div>
+								{% else %}
+								<input type="hidden" name="{{ form.authenticator.name }}" id="id_{{ form.authenticator.name }}" value="{{ form.fields.authenticator.choices.0.0 }}">
 								{% endif %}
                 <button class="btn btn-lg btn-primary btn-block" type="submit"><span class="fa fa-sign-in"></span> {% trans 'Sign in' %}</button>
 							<div id="nonStandard" style="display: none">
diff --git a/server/src/uds/templates/uds/semantic/login.html b/server/src/uds/templates/uds/semantic/login.html
index d7fb05c7f..6d4c7c9a3 100644
--- a/server/src/uds/templates/uds/semantic/login.html
+++ b/server/src/uds/templates/uds/semantic/login.html
@@ -103,6 +103,8 @@
 											{% endfor %}
 										</select>
 									</div>
+									{% else %}
+									<input type="hidden" name="{{ form.authenticator.name }}" id="id_{{ form.authenticator.name }}" value="{{ form.fields.authenticator.choices.0.0 }}">
 									{% endif %}
 									<div class="ui vertical animated blue small button signin">
 							      <div class="visible content"> {% trans "Log In" %} </div>