diff --git a/database/entity/0044-adapt_users_table_for_gradidoid/User.ts b/database/entity/0044-adapt_users_table_for_gradidoid/User.ts
index c6d26524a..f4063f65c 100644
--- a/database/entity/0044-adapt_users_table_for_gradidoid/User.ts
+++ b/database/entity/0044-adapt_users_table_for_gradidoid/User.ts
@@ -8,7 +8,7 @@ export class User extends BaseEntity {
   @Column({
     name: 'gradido_id',
     length: 36,
-    nullable: true,
+    nullable: false,
     default: null,
     collation: 'utf8mb4_unicode_ci',
   })
diff --git a/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts b/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
index 41f622722..53aac52ab 100644
--- a/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
+++ b/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
@@ -14,8 +14,8 @@ export class UserContact extends BaseEntity {
   })
   type: string
 
-  @Column({ name: 'users_id', type: 'int', unsigned: true, nullable: false })
-  usersId?: number | null
+  @Column({ name: 'user_id', type: 'int', unsigned: true, nullable: false })
+  userId: number
 
   @Column({ length: 255, unique: true, nullable: false, collation: 'utf8mb4_unicode_ci' })
   email: string
diff --git a/database/migrations/0044-adapt_users_table_for_gradidoid.ts b/database/migrations/0044-adapt_users_table_for_gradidoid.ts
index eb5f8e2cf..f1500c8c1 100644
--- a/database/migrations/0044-adapt_users_table_for_gradidoid.ts
+++ b/database/migrations/0044-adapt_users_table_for_gradidoid.ts
@@ -12,7 +12,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
       CREATE TABLE IF NOT EXISTS \`user_contacts\` (
         \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
         \`type\` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-        \`users_id\` int(10) unsigned NOT NULL,
+        \`user_id\` int(10) unsigned NOT NULL,
         \`email\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL UNIQUE,
         \`email_hash\` binary(32) NULL,
         \`email_checked\` tinyint(4) NOT NULL DEFAULT 0,
@@ -23,7 +23,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
         PRIMARY KEY (\`id\`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`)
 
-  await queryFn('ALTER TABLE `users` ADD COLUMN `gradido_id` varchar(36) NULL AFTER `id`;')
+  await queryFn('ALTER TABLE `users` ADD COLUMN `gradido_id` UUID NOT NULL DEFAULT UUID() AFTER `id`;')
   await queryFn('ALTER TABLE `users` ADD COLUMN `alias` varchar(20) NULL AFTER `gradido_id`;')
   await queryFn(
     'ALTER TABLE `users` ADD COLUMN `passphrase_encrypt_type` varchar(36) NULL AFTER `privkey`;',