diff --git a/src/Database.Tests/ModelTests.cs b/src/Database.Tests/ModelTests.cs
index c271ca85f7cfc2fd0bea4b725f5d7a960e729d37..ab7e65638701573b8c16faa9b6cc11f4a6fd3b83 100644
--- a/src/Database.Tests/ModelTests.cs
+++ b/src/Database.Tests/ModelTests.cs
@@ -1,5 +1,7 @@
-using NUnit.Framework;
+using Coscine.Database.Models;
+using NUnit.Framework;
 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.Tests
 {
diff --git a/src/Database/Models/ProjectModel.cs b/src/Database/Models/ProjectModel.cs
index 707e6d772368130d1c40d77c4f959c46bdfa585b..8ead1a9d66898e3a851a4344606274794b593821 100644
--- a/src/Database/Models/ProjectModel.cs
+++ b/src/Database/Models/ProjectModel.cs
@@ -131,7 +131,7 @@ namespace Coscine.Database.Models
             });
         }
 
-        public Project StoreFromObject(ProjectObject projectObject, User user, bool isRWTHMember = false)
+        public Project StoreFromObject(ProjectObject projectObject, User user, IDictionary<string, int> defaultQuota)
         {
             if (!projectObject.Disciplines.Any() || !projectObject.Organizations.Any())
             {
@@ -158,7 +158,7 @@ namespace Coscine.Database.Models
             {
                 SetDisciplines(project, projectObject.Disciplines);
                 SetOrganizations(project, projectObject.Organizations);
-                SetQuotas(project, isRWTHMember);
+                SetQuotas(project, defaultQuota);
             }
             catch (Exception)
             {
@@ -252,22 +252,17 @@ namespace Coscine.Database.Models
             }
         }
 
-        private void SetQuotas(Project project, bool IsRWTHMember = false)
+        public void SetQuotas(Project project, IDictionary<string, int> defaultQuotas)
         {
             ProjectQuotaModel projectQuotaModel = new ProjectQuotaModel();
             ResourceTypeModel resourceTypeModel = new ResourceTypeModel();
             foreach (var resourceType in resourceTypeModel.GetAll())
             {
-                var quota = 25;
-                if ((resourceType.DisplayName.Equals("rds") && !IsRWTHMember) || resourceType.DisplayName.Equals("rdss3"))
-                {
-                    quota = 0;
-                }
                 projectQuotaModel.Insert(new ProjectQuota
                 {
                     ProjectId = project.Id,
                     ResourceTypeId = resourceType.Id,
-                    Quota = quota
+                    Quota = defaultQuotas != null && defaultQuotas.ContainsKey(resourceType.DisplayName) ? defaultQuotas[resourceType.DisplayName] : 0
                 });
             }
         }