diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/account.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/account.ftl
index f03d64aad0..e5a0a6e2ab 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/account.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/account.ftl
@@ -10,7 +10,7 @@
     <form action="${url.accountUrl}" method="post">
         <fieldset class="border-top">
             <div class="form-group">
-                <label for="app-name">${rb.getString('username')}</label>
+                <label for="username">${rb.getString('username')}</label>
                 <input type="text" id="username" name="username" disabled="disabled" value="${user.username!''}"/>
             </div>
             <div class="form-group">
@@ -18,11 +18,11 @@
                 <input type="email" id="email" name="email" autofocus value="${user.email!''}"/>
             </div>
             <div class="form-group">
-                <label for="last-name">${rb.getString('lastName')}</label><span class="required">*</span>
+                <label for="lastName">${rb.getString('lastName')}</label><span class="required">*</span>
                 <input type="text" id="lastName" name="lastName" value="${user.lastName!''}"/>
             </div>
             <div class="form-group">
-                <label for="first-name">${rb.getString('firstName')}</label><span class="required">*</span>
+                <label for="firstName">${rb.getString('firstName')}</label><span class="required">*</span>
                 <input type="text" id="firstName" name="firstName" value="${user.firstName!''}"/>
             </div>
         </fieldset>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
index 36dec13b48..88784e0dee 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
@@ -48,16 +48,16 @@ body {
   width: 100%;
   min-width: 120em;
 }
-.rcue-login-register .background-area section {
+.rcue-login-register .background-area .section {
   float: left;
   padding: 1.5em 4.5em 1.5em 4.6em;
   width: auto;
   position: relative;
 }
-.rcue-login-register .background-area section h3 {
+.rcue-login-register .background-area .section h3 {
   display: none;
 }
-.rcue-login-register .background-area section:first-child {
+.rcue-login-register .background-area .section:first-child {
   padding-right: 4.5em;
 }
 .rcue-login-register .form-area {
@@ -69,12 +69,12 @@ body {
   background-image: url(img/login-register-social-separators.svg);
   background-position: 39.6em center;
 }
-.rcue-login-register section > p {
+.rcue-login-register .section > p {
   font-size: 1.3em;
   margin-bottom: 1.53846153846154em;
   line-height: 1.3em;
 }
-.rcue-login-register section.app-form {
+.rcue-login-register .section.app-form {
   padding-left: 0;
   position: relative;
 }
@@ -147,10 +147,10 @@ body {
 .rcue-login-register input.error[type="email"] {
   background-color: #F8E7E7;
 }
-.rcue-login-register section.social-login > span {
+.rcue-login-register .section.social-login > span {
   display: none;
 }
-.rcue-login-register section.social-login > p {
+.rcue-login-register .section.social-login > p {
   float: left;
   margin-top: 0.28571428571429em;
   /* 14px */
@@ -159,28 +159,28 @@ body {
   /* 95px */
 
 }
-.rcue-login-register section.social-login > ul {
+.rcue-login-register .section.social-login > ul {
   float: left;
 }
-.rcue-login-register section.social-login li {
+.rcue-login-register .section.social-login li {
   margin-bottom: 2em;
 }
-.rcue-login-register section.social-login li:last-child {
+.rcue-login-register .section.social-login li:last-child {
   margin-bottom: 0;
 }
-.rcue-login-register section.info-area {
+.rcue-login-register .section.info-area {
   padding-right: 0;
 }
-.rcue-login-register section.info-area p,
-.rcue-login-register section.info-area li {
+.rcue-login-register .section.info-area p,
+.rcue-login-register .section.info-area li {
   font-size: 1.4em;
   margin-bottom: 1.64285714285714em;
 }
-.rcue-login-register section.info-area li {
+.rcue-login-register .section.info-area li {
   color: #999;
   margin-bottom: 1em;
 }
-.rcue-login-register section.info-area li:last-child {
+.rcue-login-register .section.info-area li:last-child {
   margin-bottom: 0;
 }
 @media screen and (min-width: 1280px) {
@@ -284,11 +284,11 @@ a.zocial:before {
   color: #0099D3;
 }
 /* Forgot Password page */
-.rcue-login-register.reset .background-area section {
+.rcue-login-register.reset .background-area .section {
   padding-top: 0;
   padding-bottom: 0;
 }
-.rcue-login-register.reset .background-area section.app-form {
+.rcue-login-register.reset .background-area .section.app-form {
   width: 43.2em;
 }
 .rcue-login-register.reset .feedback {
@@ -342,10 +342,10 @@ a.zocial:before {
   position: inherit;
   margin-top: 16em;
 }
-.rcue-login-register.email .background-area section {
+.rcue-login-register.email .background-area .section {
   width: 41.2em;
 }
-.rcue-login-register.email .background-area section.email {
+.rcue-login-register.email .background-area .section.email {
   width: 45.8em;
 }
 .rcue-login-register.email label {
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-config-totp.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-config-totp.ftl
index bceee99dc0..82f82f36fd 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-config-totp.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-config-totp.ftl
@@ -10,7 +10,7 @@
 
     <#elseif section = "form">
 
-    <div name="form">
+    <div id="form">
         <h2>To setup Google Authenticator</h2>
 
         <ol>
@@ -35,7 +35,7 @@
 
     <#elseif section = "info" >
 
-    <div name="info">
+    <div id="info">
     </div>
 
     </#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
index c315a35ac0..6aaddd7b8c 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
@@ -10,7 +10,7 @@
 
     <#elseif section = "form">
 
-    <div name="form">
+    <div id="form">
         <form action="${url.passwordResetUrl}" method="post">
             <div>
                 <label for="username">${rb.getString('username')}</label>
@@ -27,7 +27,7 @@
 
     <#elseif section = "info" >
 
-    <div name="info">
+    <div id="info">
     </div>
 
     </#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl
index 88e61a0369..e45628490c 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl
@@ -12,8 +12,8 @@
     <#elseif section = "form">
 
     <form action="${url.loginAction}" method="post">
-        <input id="username" name="username" value="${login.username?default('')}" type="hidden" />
-        <input id="password" name="password" value="${login.password?default('')}" type="hidden" />
+        <input id="username" name="username" value="${login.username!''}" type="hidden" />
+        <input id="password" name="password" value="${login.password!''}" type="hidden" />
 
         <div>
             <label for="totp">${rb.getString('authenticatorCode')}</label>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
index 51954e8b38..7a13ecc978 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
@@ -10,7 +10,7 @@
 
     <#elseif section = "form">
 
-    <div name="form">
+    <div id="form">
         <form action="${url.passwordUrl}" method="post">
         	<div>
             	<label for="password-new">${rb.getString('passwordNew')}</label>
@@ -27,7 +27,7 @@
 
     <#elseif section = "info" >
 
-    <div name="info">
+    <div id="info">
     </div>
 
     </#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
index 237faf4a15..06a06af6cf 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
@@ -10,19 +10,19 @@
 
     <#elseif section = "form">
 
-    <div name="form">
+    <div id="form">
         <form action="${url.accountUrl}" method="post">
         	<div>
             	<label for="firstName">${rb.getString('firstName')}</label>
-	            <input type="text" id="firstName" name="firstName" value="${user.firstName?default('')}" />
+	            <input type="text" id="firstName" name="firstName" value="${user.firstName!''}" />
     	    </div>
 	        <div>
     	        <label for="lastName">${rb.getString('lastName')}</label>
-            	<input type="text" id="lastName" name="lastName" value="${user.lastName?default('')}" />
+            	<input type="text" id="lastName" name="lastName" value="${user.lastName!''}" />
         	</div>
 	        <div>
     	        <label for="email">${rb.getString('email')}</label>
-            	<input type="text" id="email" name="email" value="${user.email?default('')}" />
+            	<input type="text" id="email" name="email" value="${user.email!''}" />
 	        </div>
 
             <div class="aside-btn">
@@ -34,7 +34,7 @@
 
     <#elseif section = "info" >
 
-    <div name="info">
+    <div id="info">
     </div>
 
     </#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl
index bd2b14114c..d6c62b00af 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl
@@ -10,14 +10,14 @@
 
     <#elseif section = "form">
 
-    <div name="form">
+    <div id="form">
     	An email with instructions to verify your email address has been sent to you. If you don't receive this email, 
     	<a href="${url.emailVerificationUrl}">click here</a> to re-send the email.
     </div>
 
     <#elseif section = "info" >
 
-    <div name="info">
+    <div id="info">
     </div>
 
     </#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
index ffdf39454e..24c4cce7cf 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
@@ -6,12 +6,12 @@
 
     <#elseif section = "header">
 
-    Log in to <strong>${(realm.name)?default('')}</strong>
+    Log in to <strong>${(realm.name)!''}</strong>
 
     <#elseif section = "form">
 
-    <div name="form">
-        <form action="${url.loginAction?default('')}" method="post">
+    <div id="form">
+        <form action="${url.loginAction}" method="post">
             <div>
                 <label for="username">${rb.getString('username')}</label>
                 <input id="username" name="username" value="${login.username!''}" type="text" />
@@ -32,9 +32,9 @@
 
     <#elseif section = "info" >
 
-    <div name="info">
+    <div id="info">
         <#if realm.registrationAllowed>
-            <p>${rb.getString('noAccount')} <a href="${url.registrationUrl!''}">${rb.getString('register')}</a>.</p>
+            <p>${rb.getString('noAccount')} <a href="${url.registrationUrl}">${rb.getString('register')}</a>.</p>
         </#if>
         
         <a href="${url.passwordResetUrl}">Reset password</a>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/password.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/password.ftl
index 3b8b3d48cd..b2ae5294ce 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/password.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/password.ftl
@@ -14,11 +14,11 @@
                 <input type="password" id="password" name="password" autofocus>
             </div>
             <div class="form-group">
-                <label for="new-password">${rb.getString('passwordNew')}</label>
+                <label for="password-new">${rb.getString('passwordNew')}</label>
                 <input type="password" id="password-new" name="password-new" placeholder="At least 6 characters" class="error">
             </div>
             <div class="form-group">
-                <label for="new-password-confirm" class="two-lines">${rb.getString('passwordConfirm')}</label>
+                <label for="password-confirm" class="two-lines">${rb.getString('passwordConfirm')}</label>
                 <input type="password" id="password-confirm" name="password-confirm" class="error">
             </div>
         </fieldset>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl
index 5bf3f47278..b418da1d3e 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl
@@ -15,15 +15,15 @@
         <p class="subtitle">${rb.getString('allRequired')}</p>
         <div>
             <label for="name">${rb.getString('fullName')}</label>
-            <input type="text" id="name" name="name" value="${register.formData.name?default('')}" />
+            <input type="text" id="name" name="name" value="${register.formData.name!''}" />
         </div>
         <div>
             <label for="email">${rb.getString('email')}</label>
-            <input type="text" id="email" name="email" value="${register.formData.email?default('')}" />
+            <input type="text" id="email" name="email" value="${register.formData.email!''}" />
         </div>
         <div>
             <label for="username">${rb.getString('username')}</label>
-            <input type="text" id="username" name="username" value="${register.formData.username?default('')}" />
+            <input type="text" id="username" name="username" value="${register.formData.username!''}" />
         </div>
         <div>
             <label for="password">${rb.getString('password')}</label>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
index b0762b6b6e..4f20710faf 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
@@ -1,6 +1,6 @@
 <#macro registrationLayout bodyClass>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -8,7 +8,7 @@
         <#nested "title">
     </title>
     <link href="${template.themeConfig.styles}" rel="stylesheet" />
-    <style>
+    <style type="text/css">
         body.rcue-login-register {
             background-image: url("${template.themeConfig.background}");
         }
@@ -29,10 +29,10 @@
 
         <div class="background-area">
             <div class="form-area clearfix">
-                <section class="app-form">
+                <div class="section app-form">
                     <h3>Application login area</h3>
                     <#nested "form">
-                </section>
+                </div>
 
                 <#if error?has_content>
                     <div class="feedback error bottom-left show">
@@ -42,10 +42,10 @@
                     </div>
                 </#if>
 
-                <section class="info-area">
+                <div class="section info-area">
                     <h3>Info area</h3>
                     <#nested "info">
-                </section>
+                </div>
             </div>
         </div>
 
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
index 0dc2539904..d8cca1f1c7 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
@@ -1,6 +1,6 @@
 <#macro registrationLayout bodyClass>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -8,7 +8,7 @@
         <#nested "title">
     </title>
     <link href="${template.themeConfig.styles}" rel="stylesheet" />
-    <style>
+    <style type="text/css">
         body.rcue-login-register {
             background-image: url("${template.themeConfig.background}");
         }
@@ -29,10 +29,10 @@
 
         <div class="background-area">
             <div class="form-area ${(realm.social)?string('social','')} clearfix">
-                <section class="app-form">
+                <div class="section app-form">
                     <h3>Application login area</h3>
                     <#nested "form">
-                </section>
+                </div>
 
                 <#if error?has_content>
                     <div class="feedback error bottom-left show">
@@ -43,7 +43,7 @@
                 </#if>
 
                 <#if social.displaySocialProviders>
-                    <section class="social-login"> <span>or</span>
+                    <div class="section social-login"> <span>or</span>
                         <h3>Social login area</h3>
                         <p>${rb.getString('logInWith')}</p>
                         <ul>
@@ -51,13 +51,13 @@
                                 <li><a href="${p.loginUrl}" class="zocial ${p.id}"> <span class="text">${p.name}</span></a></li>
                             </#list>
                         </ul>
-                    </section>
+                    </div>
                 </#if>
 
-                <section class="info-area">
+                <div class="section info-area">
                     <h3>Info area</h3>
                     <#nested "info">
-                </section>
+                </div>
             </div>
         </div>
 
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-main.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-main.ftl
index 2b3591ecfa..9f27f1e384 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-main.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-main.ftl
@@ -13,6 +13,7 @@
 
     <link rel="stylesheet" href="${template.formsPath}/theme/${template.theme}/css/sprites.css">
     <link rel="stylesheet" href="${template.formsPath}/theme/${template.theme}/css/select2.css">
+    <!-- TODO remove external links -->
     <link rel="stylesheet" href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic'>
 
     <!-- RCUE styles -->
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl
index cc81705d88..b1f44e7670 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/totp.ftl
@@ -26,7 +26,7 @@
                 <p><strong>3</strong>Enter the one-time-password provided by Google Authenticator below and click Submit to finish the setup.</p>
                 <form action="${url.totpUrl}" method="post">
                     <div class="form-group">
-                        <label for="otp">${rb.getString('authenticatorCode')}</label>
+                        <label for="totp">${rb.getString('authenticatorCode')}</label>
                         <input type="text" id="totp" name="totp" />
                         <input type="hidden" id="totpSecret" name="totpSecret" value="${totp.totpSecret}" />
                     </div>