diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index b2c6a4f5..a2e1df0c 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -472,13 +472,14 @@ module.directive("tgChangePasswordFromRecovery", ["$tgAuth", "$tgConfirm", "$tgL
 ## Invitation
 #############################################################################
 
-InvitationDirective = ($auth, $confirm, $location, $params, $navUrls, $analytics, $translate) ->
+InvitationDirective = ($auth, $confirm, $location, $params, $navUrls, $analytics, $translate, config) ->
     link = ($scope, $el, $attrs) ->
         token = $params.token
 
         promise = $auth.getInvitation(token)
         promise.then (invitation) ->
             $scope.invitation = invitation
+            $scope.publicRegisterEnabled = config.get("publicRegisterEnabled")
 
         promise.then null, (response) ->
             $location.path($navUrls.resolve("login"))
@@ -549,7 +550,7 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls, $analytics
     return {link:link}
 
 module.directive("tgInvitation", ["$tgAuth", "$tgConfirm", "$tgLocation", "$routeParams",
-                                  "$tgNavUrls", "$tgAnalytics", "$translate", InvitationDirective])
+                                  "$tgNavUrls", "$tgAnalytics", "$translate", "$tgConfig", InvitationDirective])
 
 
 #############################################################################
diff --git a/app/partials/auth/invitation.jade b/app/partials/auth/invitation.jade
index caf9041c..6288b606 100644
--- a/app/partials/auth/invitation.jade
+++ b/app/partials/auth/invitation.jade
@@ -10,6 +10,6 @@ div.wrapper
                 p(translate="AUTH.INVITED_YOU")
                 p.project-name(tg-bo-bind="invitation.project_name")
 
-            div.invitation-form
+            div.invitation-form(ng-class="{'public-register-disabled': !publicRegisterEnabled}")
                 include ../includes/modules/invitation-login-form
                 include ../includes/modules/invitation-register-form
diff --git a/app/partials/includes/modules/invitation-register-form.jade b/app/partials/includes/modules/invitation-register-form.jade
index b5921ffa..c943db40 100644
--- a/app/partials/includes/modules/invitation-register-form.jade
+++ b/app/partials/includes/modules/invitation-register-form.jade
@@ -1,9 +1,9 @@
-form.register-form
+form.register-form(ng-if="publicRegisterEnabled")
     p.form-header(translate="REGISTER_FORM.TITLE")
     fieldset
         input(
             type="text"
-            autocorrect="off" 
+            autocorrect="off"
             autocapitalize="none"
             name="username"
             ng-model="dataRegister.username"
diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss
index f8d1ea37..cbdf801c 100644
--- a/app/styles/layout/invitation.scss
+++ b/app/styles/layout/invitation.scss
@@ -101,4 +101,10 @@
     .login-form {
         border-right: 1px solid rgba($white, .3);
     }
+    .public-register-disabled {
+        width: 400px;
+        .login-form {
+            border-right: 0;
+        }
+    }
 }