diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 3185f2e29..1e848d289 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -169,7 +169,7 @@ define(function() {
     // make them have a very slow loading time. To avoid impacting the user experience
     // significantly, we're limiting the number of teams per user to 3 by default.
     // You can change this value here.
-    //config.maxTeamsSlots = 3;
+    //config.maxTeamsSlots = 5;
 
     // Each team is considered as a registered user by the server. Users and teams are indistinguishable
     // in the database so teams will offer the same storage limits as users by default.
@@ -177,7 +177,7 @@ define(function() {
     // We're limiting the number of teams each user is able to own to 1 in order to make sure
     // users don't use "fake" teams (1 member) just to increase their storage limit.
     // You can change the value here.
-    // config.maxOwnedTeams = 1;
+    // config.maxOwnedTeams = 5;
 
     return config;
 });
diff --git a/www/common/common-constants.js b/www/common/common-constants.js
index 17db2302c..fdae2b5de 100644
--- a/www/common/common-constants.js
+++ b/www/common/common-constants.js
@@ -12,8 +12,8 @@ define(['/customize/application_config.js'], function (AppConfig) {
         tokenKey: 'loginToken',
         displayPadCreationScreen: 'displayPadCreationScreen',
         deprecatedKey: 'deprecated',
-        MAX_TEAMS_SLOTS: AppConfig.maxTeamsSlots || 3,
-        MAX_TEAMS_OWNED: AppConfig.maxOwnedTeams || 1,
+        MAX_TEAMS_SLOTS: AppConfig.maxTeamsSlots || 5,
+        MAX_TEAMS_OWNED: AppConfig.maxOwnedTeams || 5,
         // Apps
         criticalApps: ['profile', 'settings', 'debug', 'admin', 'support', 'notifications']
     };
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 7af3d7afc..2c37eabf0 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -476,7 +476,7 @@ define([
         var getWarningBox = function () {
             return h('div.alert.alert-warning', {
                 role:'alert'
-            }, isOwner ? Messages.team_maxOwner : Messages._getKey('team_maxTeams', [MAX_TEAMS_SLOTS]));
+            }, Messages._getKey('team_maxTeams', [MAX_TEAMS_SLOTS]));
         };
 
         if (Object.keys(privateData.teams || {}).length >= Constants.MAX_TEAMS_SLOTS || isOwner) {