diff --git a/core/server/api/authentication.js b/core/server/api/authentication.js
index <HASH>..<HASH> 100644
--- a/core/server/api/authentication.js
+++ b/core/server/api/authentication.js
@@ -189,8 +189,10 @@ authentication = {
             if (ownerUser) {
                 return dataProvider.User.setup(setupUser, _.extend(internal, {id: ownerUser.id}));
             } else {
-                // TODO: needs to pass owner role when role endpoint is finished!
-                return dataProvider.User.add(setupUser, internal);
+                return dataProvider.Role.findOne({name: 'Owner'}).then(function (ownerRole) {
+                    setupUser.roles = [ownerRole.id];
+                    return dataProvider.User.add(setupUser, internal);
+                });
             }
         }).then(function (user) {
             var userSettings = [];
Add owner role to setup user

closes #<I>
- added owner role to user that is added if no user is available