diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index e64df8294..8d56c6775 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -14,7 +14,7 @@ export class User {
     this.emailId = user.emailId
     if (user.emailContact) {
       this.email = user.emailContact.email
-      this.emailContact = user.emailContact
+      this.emailContact = new UserContact(user.emailContact)
       this.emailChecked = user.emailContact.emailChecked
     }
     this.firstName = user.firstName
diff --git a/backend/src/graphql/model/UserContact.ts b/backend/src/graphql/model/UserContact.ts
index 902e2f9f2..fda79559f 100644
--- a/backend/src/graphql/model/UserContact.ts
+++ b/backend/src/graphql/model/UserContact.ts
@@ -1,9 +1,9 @@
 import { ObjectType, Field } from 'type-graphql'
-import { UserContact as dbUserCOntact} from '@entity/UserContact'
+import { UserContact as dbUserContact} from '@entity/UserContact'
 
 @ObjectType()
 export class UserContact {
-  constructor(userContact: dbUserCOntact) {
+  constructor(userContact: dbUserContact) {
     this.id = userContact.id
     this.type = userContact.type
     this.userId = userContact.userId
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 37a9946a7..2ed77dbdd 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -850,11 +850,7 @@ export class UserResolver {
   @Query(() => Boolean)
   async hasElopage(@Ctx() context: Context): Promise<boolean> {
     logger.info(`hasElopage()...`)
-    const userEntity = context.user
-    if (!userEntity) {
-      logger.info('missing context.user for EloPage-check')
-      return false
-    }
+    const userEntity = getUser(context)
     const elopageBuys = hasElopageBuys(userEntity.emailContact.email)
     logger.debug(`has ElopageBuys = ${elopageBuys}`)
     return elopageBuys
diff --git a/database/entity/0048-add_user_contacts_table/User.ts b/database/entity/0048-add_user_contacts_table/User.ts
index 6c4bf52f1..ab79c8ffa 100644
--- a/database/entity/0048-add_user_contacts_table/User.ts
+++ b/database/entity/0048-add_user_contacts_table/User.ts
@@ -43,7 +43,7 @@ export class User extends BaseEntity {
   @Column({ length: 255, unique: true, nullable: false, collation: 'utf8mb4_unicode_ci' })
   email: string
   */
-  @OneToOne(() => UserContact, (emailContact) => emailContact.userId)
+  @OneToOne(() => UserContact, (emailContact) => emailContact.user)
   @JoinColumn({ name: 'email_id' })
   emailContact: UserContact
 
@@ -115,7 +115,7 @@ export class User extends BaseEntity {
   @JoinColumn({ name: 'user_id' })
   contributions?: Contribution[]
 
-  @OneToMany(() => UserContact, (usercontact) => usercontact.userId)
+  @OneToMany(() => UserContact, (usercontact) => usercontact.user)
   @JoinColumn({ name: 'user_id' })
   usercontacts?: UserContact[]
 }
diff --git a/database/entity/0048-add_user_contacts_table/UserContact.ts b/database/entity/0048-add_user_contacts_table/UserContact.ts
index 942a7de4f..20732ae6f 100644
--- a/database/entity/0048-add_user_contacts_table/UserContact.ts
+++ b/database/entity/0048-add_user_contacts_table/UserContact.ts
@@ -53,7 +53,7 @@ export class UserContact extends BaseEntity {
   @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP', nullable: false })
   createdAt: Date
 
-  @DeleteDateColumn({ name: 'updated_at', nullable: true })
+  @Column({ name: 'updated_at', nullable: true, default: null, type: 'datetime' })
   updatedAt: Date | null
 
   @DeleteDateColumn({ name: 'deleted_at', nullable: true })