diff --git a/server/src/uds/templates/uds/html5/detectJava.html b/server/src/uds/templates/uds/html5/detectJava.html
new file mode 100644
index 000000000..dac967f29
--- /dev/null
+++ b/server/src/uds/templates/uds/html5/detectJava.html
@@ -0,0 +1,29 @@
+{% extends "uds/html5/templates/base.html" %}
+{% load i18n static %}
+
+{% block title %}{% trans "Login redirection to UDS" %}{% endblock %}
+
+{% block script %}
+<script src="{% get_static_prefix %}js/PluginDetect_Java.js" type="text/javascript" ></script>
+<script type="text/javascript">
+	function isJavaAvailable() {
+		if( PluginDetect.isMinVersion('Java', '1,6,0,0','{% get_static_prefix %}/other/getJavaInfo.jar') == 1 )
+			return true;
+		
+		return false;  
+	}
+	
+	$(document).ready(function() {
+		var java = isJavaAvailable() ? "y" : "n";
+		window.location.replace("{% url "uds.web.views.authJava" idAuth=idAuth hasJava='' %}" + java);
+	   });
+	   
+	
+</script>	
+{% endblock %}
+
+{% block body %}
+<!--<div>
+<a href="<a href="{% url "uds.web.views.index" %}">{% trans "Go to main page" %}
+</div>-->
+{% endblock %}
\ No newline at end of file
diff --git a/server/src/uds/templates/uds/html5/index.html b/server/src/uds/templates/uds/html5/index.html
index 124134321..7c16832d5 100644
--- a/server/src/uds/templates/uds/html5/index.html
+++ b/server/src/uds/templates/uds/html5/index.html
@@ -1,7 +1,7 @@
-{% extends "uds/html5/internal_page.html" %}
+{% extends "uds/html5/templates/internal_page.html" %}
 {% load i18n static html5 %}
 
-{% block title %}{% trans 'Available services list' %}
+{% block title %}{% trans 'Available services list' %}{% endblock %}
 
 {% block css %}
         <style>
diff --git a/server/src/uds/templates/uds/html5/login.html b/server/src/uds/templates/uds/html5/login.html
index a20e3d59c..795df7013 100644
--- a/server/src/uds/templates/uds/html5/login.html
+++ b/server/src/uds/templates/uds/html5/login.html
@@ -1,4 +1,4 @@
-{% extends "uds/html5/base.html" %}
+{% extends "uds/html5/templates/base.html" %}
 {% load i18n static html5 %}
 
 {% block title %}{% trans 'Welcome to UDS' %}{% endblock %}
diff --git a/server/src/uds/templates/uds/html5/prefs.html b/server/src/uds/templates/uds/html5/prefs.html
index 930d84cca..fdb930a04 100644
--- a/server/src/uds/templates/uds/html5/prefs.html
+++ b/server/src/uds/templates/uds/html5/prefs.html
@@ -1,21 +1,14 @@
-{% extends "uds/internal_page.html" %}
+{% extends "uds/html5/templates/internal_page.html" %}
 {% load i18n %}
 {% load static %}
 
-{% block title %}
-{% trans "UDS User Preferences" %}
-{% endblock %}
+{% block title %}{% trans "UDS User Preferences" %}{% endblock %}
 
-{% block content %}
-	<div>
-		
-		<h2>{% trans "Preferences" %}</h2>
-		<form name="form1" method="post" action="">
-		{% csrf_token %}
-		{% autoescape off %}{{ prefs_form }}{% endautoescape %}
-		<input type="submit" name="submit" value="{% trans "Save Preferences" %}"/>
+{% block body %}
+		<form name="form1" method="post" class="form-preferences">
+    		{% csrf_token %}
+    		{% autoescape off %}{{ prefs_form }}{% endautoescape %}
+            <a href="{% url "uds.web.views.index" %}" class="btn btn-warning">{% trans "Cancel" %}</a>
+            <button type="submit" class="btn btn-success pull-right">{% trans "Save Preferences" %}</button>
 		</form>
-		{% include "uds/snippets/back_to_list.html" %}
-		
-	</div>
 {% endblock %}
\ No newline at end of file
diff --git a/server/src/uds/templates/uds/html5/snippets/navbar_inner.html b/server/src/uds/templates/uds/html5/snippets/navbar_inner.html
index 9c5d938af..4c57304e3 100644
--- a/server/src/uds/templates/uds/html5/snippets/navbar_inner.html
+++ b/server/src/uds/templates/uds/html5/snippets/navbar_inner.html
@@ -3,7 +3,7 @@
 {% block navbar %}
 		 <div class="collapse navbar-collapse navbar-ex1-collapse">
 		 	<ul class="nav navbar-nav">
-		 		<li><a href="{% url "uds.web.views.prefs" %}">{% trans "User" %} {{ user.real_name }}</a></li>
+		 		<li><a href="{% url "uds.web.views.prefs" %}" title="{% trans 'Preferences' %}">{{ user.real_name }}</a></li>
 		 	</ul>
 			{% include "uds/html5/snippets/nav-right.html" with logout=True %}
 		 </div>
diff --git a/server/src/uds/templates/uds/html5/base.html b/server/src/uds/templates/uds/html5/templates/base.html
similarity index 100%
rename from server/src/uds/templates/uds/html5/base.html
rename to server/src/uds/templates/uds/html5/templates/base.html
diff --git a/server/src/uds/templates/uds/html5/internal_page.html b/server/src/uds/templates/uds/html5/templates/internal_page.html
similarity index 91%
rename from server/src/uds/templates/uds/html5/internal_page.html
rename to server/src/uds/templates/uds/html5/templates/internal_page.html
index f884b8231..6171900ff 100644
--- a/server/src/uds/templates/uds/html5/internal_page.html
+++ b/server/src/uds/templates/uds/html5/templates/internal_page.html
@@ -1,4 +1,4 @@
-{% extends "uds/html5/base.html" %}
+{% extends "uds/html5/templates/base.html" %}
 {% load i18n static html5 %}
 
 {% block js %}