diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 87131eaf..a5c33af0 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -145,6 +145,31 @@ module.service("$tgAuth", AuthService)
 ## Login Directive
 #############################################################################
 
+# Directive that manages the visualization of public register
+# message/link on login page.
+
+PublicRegisterMessageDirective = ($config) ->
+    template = _.template("""
+    <p class="login-text">
+        <span>Not registered yet?</span>
+        <a href="<%= url %>" tg-nav="register" title="Register"> create your free account here</a>
+    </p>""")
+
+    templateFn = ->
+        url = $config.get("publicRegisterEnabled")
+        if not url
+            return ""
+        return template({url:url})
+
+    return {
+        restrict: "AE"
+        scope: {}
+        template: templateFn
+    }
+
+
+module.directive("tgPublicRegisterMessage", ["$tgConfig", PublicRegisterMessageDirective])
+
 LoginDirective = ($auth, $confirm, $location, $config, $routeParams, $navUrls) ->
     link = ($scope, $el, $attrs) ->
         $scope.pubblicRegisterEnabled = $config.get("pubblicRegisterEnabled")
diff --git a/app/partials/views/modules/login-form.jade b/app/partials/views/modules/login-form.jade
index f3dec69e..3dca584e 100644
--- a/app/partials/views/modules/login-form.jade
+++ b/app/partials/views/modules/login-form.jade
@@ -13,6 +13,4 @@ div.login-form-container(tg-login)
             a.button.button-login.button-gray(href="", ng-click="ctrl.submit()", title="Sign in") Sign in
             input(type="submit", style="display:none")
 
-    p.login-text(ng-if="pubblicRegisterEnabled")
-        span Not registered yet?
-        a(href="", tg-nav="register", title="Register")  create your free account here
+    tg-public-register-message