diff --git a/app/options.py b/app/options.py
index ba6e32c9..47e7d03f 100644
--- a/app/options.py
+++ b/app/options.py
@@ -410,7 +410,7 @@ if form.getvalue('action_hap') is not None and serv is not None:
         servers = sql.select_servers(server=serv)
         for server in servers:
             server_id = server[0]
-        haproxy_enterprise = sql.select_service_setting(serv, 'haproxy', 'haproxy_enterprise')
+        haproxy_enterprise = sql.select_service_setting(server_id, 'haproxy', 'haproxy_enterprise')
         if haproxy_enterprise == '1':
             haproxy_service_name = "hapee-2.0-lb"
         else:
diff --git a/app/templates/include/geoip_select.html b/app/templates/include/geoip_select.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/templates/include/login.html b/app/templates/include/login.html
index 760063fa..bb70b0ad 100644
--- a/app/templates/include/login.html
+++ b/app/templates/include/login.html
@@ -1,6 +1,5 @@
 {% if user %}
-	<span id="show-user-settings-button" class="menu-bar login" title="User settings" style="margin-top: 7px;cursor: pointer;"></span>
-<!--	<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>						-->
+	<span id="show-user-settings-button" class="menu-bar login" title="User settings for user {{ user }}" style="margin-top: 7px;"></span>
 {% else %}
 	<a href=/app/login.py title="Login" class="login"> Login</a>
 {% endif %}
\ No newline at end of file