diff --git a/client/views/signUp/signUp.coffee b/client/views/signUp/signUp.coffee
index 8a253d66..3d651c61 100644
--- a/client/views/signUp/signUp.coffee
+++ b/client/views/signUp/signUp.coffee
@@ -52,6 +52,9 @@ AccountsEntry.entrySignUpEvents = {
   'submit #signUp': (event, t) ->
     event.preventDefault()
 
+    if Accounts._options.forbidClientAccountCreation
+      return
+
     username =
       if t.find('input[name="username"]')
         t.find('input[name="username"]').value.toLowerCase()
diff --git a/server/entry.coffee b/server/entry.coffee
index fd467daf..81b136e8 100644
--- a/server/entry.coffee
+++ b/server/entry.coffee
@@ -16,6 +16,9 @@ Meteor.startup ->
       not AccountsEntry.settings.signupCode or signupCode is AccountsEntry.settings.signupCode
 
     entryCreateUser: (user) ->
+      if Accounts._options.forbidClientAccountCreation
+        return
+
       check user, Object
       profile = AccountsEntry.settings.defaultProfile || {}
       if user.username