diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala
index e324f534c..2c4a0862a 100644
--- a/obp-api/src/main/scala/code/snippet/WebUI.scala
+++ b/obp-api/src/main/scala/code/snippet/WebUI.scala
@@ -463,6 +463,9 @@ class WebUI extends MdcLoggable{
   def forBanks: CssSel = {
     "@for-banks [style]" #> s"display: $displayForBanks"
   }
+  def userIsLoggedIn: CssSel = {
+    "#register-link [href]" #> scala.xml.Unparsed(s"/already-logged-in")
+  }
 
   def alreadyLoggedIn: CssSel = {
     lazy val logoutLink = s" ${Constant.HostName}${AuthUser.logoutPath.foldLeft("")(_ + "/" + _)}"
diff --git a/obp-api/src/main/webapp/templates-hidden/default.html b/obp-api/src/main/webapp/templates-hidden/default.html
index 1858c18f5..8ef1fb3ac 100644
--- a/obp-api/src/main/webapp/templates-hidden/default.html
+++ b/obp-api/src/main/webapp/templates-hidden/default.html
@@ -135,7 +135,7 @@ Berlin 13359, Germany
 						<!-- login state -->
 						<li data-lift="Nav.item?name=Login" class="navitem">
 							<!-- LOGGED OUT -->
-							<p>
+							<p data-lift="WebUI.userIsLoggedIn">
 								<a href="/user_mgt/sign_up" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
 							</p>
 						</li>
@@ -191,7 +191,7 @@ Berlin 13359, Germany
 				</li>
 				<li>
 					<div class="navitem" id="register-link-nav">
-						<a href="/user_mgt/sign_up" class="navbar-btn" id ="register-link">Register</a>
+						<a data-lift="WebUI.userIsLoggedIn" href="/user_mgt/sign_up" class="navbar-btn" id ="register-link">Register</a>
 						<a data-lift="Login.loggedIn" href="#" class="logout">Log off</a></p>
 					</div>
 				</li>