diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee
index 7e11f3bc18..04cde26198 100644
--- a/services/web/app/coffee/models/User.coffee
+++ b/services/web/app/coffee/models/User.coffee
@@ -31,6 +31,8 @@ UserSchema = new Schema
 							collaborators: { type:Number,  default: Settings.defaultFeatures.collaborators }
 							versioning:    { type:Boolean, default: Settings.defaultFeatures.versioning }
 							dropbox:       { type:Boolean, default: Settings.defaultFeatures.dropbox }
+							compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout }
+							compileGroup:  { type:String,  default: Settings.defaultFeatures.compileGroup }
 						}
 	featureSwitches	  : {
 							github: {type: Boolean}
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index b742123720..4d0a38298a 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -130,6 +130,8 @@ module.exports =
 		collaborators: -1
 		dropbox: true
 		versioning: true
+		compileTimeout: 60
+		compileGroup: "standard"
 
 	plans: plans = [{
 		planCode: "personal"