diff --git a/src/middleware/packages/auth/mixins/auth.sso.js b/src/middleware/packages/auth/mixins/auth.sso.js
index eba4f7741..8838ac99d 100644
--- a/src/middleware/packages/auth/mixins/auth.sso.js
+++ b/src/middleware/packages/auth/mixins/auth.sso.js
@@ -1,4 +1,5 @@
 const session = require('express-session');
+const { v4: uuidv4 } = require('uuid');
 const AuthMixin = require('./auth');
 const saveRedirectUrl = require('../middlewares/saveRedirectUrl');
 const redirectToFront = require('../middlewares/redirectToFront');
@@ -43,7 +44,7 @@ const AuthSSOMixin = {
         accountData = await ctx.call('auth.account.create', {
           uuid: profileData.uuid,
           email: profileData.email,
-          username: profileData.username
+          username: profileData.username || uuidv4(),
         });
         webId = await ctx.call('webid.create', this.pickWebIdData({ nick: accountData.username, ...profileData }));
         newUser = true;
diff --git a/src/middleware/packages/auth/package.json b/src/middleware/packages/auth/package.json
index 2fe592b97..50d6c363c 100644
--- a/src/middleware/packages/auth/package.json
+++ b/src/middleware/packages/auth/package.json
@@ -20,7 +20,8 @@
     "passport-cas2": "0.0.12",
     "passport-local": "^1.0.0",
     "pug": "^3.0.2",
-    "url-join": "^4.0.1"
+    "url-join": "^4.0.1",
+    "uuid": "^9.0.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/src/middleware/yarn.lock b/src/middleware/yarn.lock
index 41361fa3b..7ed3df4a1 100644
--- a/src/middleware/yarn.lock
+++ b/src/middleware/yarn.lock
@@ -10268,6 +10268,11 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
 valid-data-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/valid-data-url/-/valid-data-url-2.0.0.tgz#2220fa9f8d4e761ebd3f3bb02770f1212b810537"