diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 1f3e7519df..f38e9cd16b 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -9,7 +9,7 @@ if (!Accounts._options) {
 // - sendConfirmationEmail {Boolean}
 //     Send email address confirmation emails to new users created from
 //     client signups.
-// - forbidSignups {Boolean}
+// - forbidClientAccountCreation {Boolean}
 //     Do not allow clients to create accounts directly.
 Accounts.config = function(options) {
   Accounts._options = options;
diff --git a/packages/accounts-password/passwords_server.js b/packages/accounts-password/passwords_server.js
index 9771eadbd9..85d8932914 100644
--- a/packages/accounts-password/passwords_server.js
+++ b/packages/accounts-password/passwords_server.js
@@ -353,7 +353,7 @@
     createUser: function (options, extra) {
       options = _.clone(options);
       options.generateLoginToken = true;
-      if (Accounts._options.forbidSignups)
+      if (Accounts._options.forbidClientAccountCreation)
         throw new Meteor.Error(403, "Signups forbidden");
 
       // Create user. result contains id and token.
diff --git a/packages/accounts-password/passwords_tests.js b/packages/accounts-password/passwords_tests.js
index ab401d4d9c..79058da652 100644
--- a/packages/accounts-password/passwords_tests.js
+++ b/packages/accounts-password/passwords_tests.js
@@ -330,5 +330,5 @@ if (Meteor.isServer) (function () {
     });
   });
 
-  // XXX would be nice to test Accounts.config({forbidSignups: true})
+  // XXX would be nice to test Accounts.config({forbidClientAccountCreation: true})
 }) ();