diff --git a/pybossa/repositories/user_repository.py b/pybossa/repositories/user_repository.py
index 0ef7f74..7118518 100644
--- a/pybossa/repositories/user_repository.py
+++ b/pybossa/repositories/user_repository.py
@@ -96,6 +96,14 @@ class UserRepository(object):
 
     def get_profile_by(self, **attributes):
         return self.db.session.query(Profile).filter_by(**attributes).first()
+
+    def get_profiles_list(self):
+        profiles = self.db.session.query(Profile).all()
+        result = []
+        for profile in profiles:
+            name = profile.name
+            result.append((name, name))
+        return result
     
     def profile_has_access(self, user, project_name):
         profile = self.get_profile(user.profile_id)
diff --git a/pybossa/view/account.py b/pybossa/view/account.py
index c8e2b0a..8134fa3 100644
--- a/pybossa/view/account.py
+++ b/pybossa/view/account.py
@@ -199,7 +199,10 @@ def register():
 
     """
     form = RegisterForm(request.form)
-    form.set_profile_choices(current_app.config.get('PROFILES'))
+    profiles = current_app.config.get('PROFILES')
+    if profiles is None:
+        profiles = user_repo.get_profiles_list()
+    form.set_profile_choices(profiles)
     if request.method == 'POST' and form.validate():
         account = dict(fullname=form.fullname.data, name=form.name.data,
                        email_addr=form.email_addr.data,
--
libgit2 0.21.2