diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4692cab49..0a7f33ebf 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -64,18 +64,14 @@
 
       <template #cell(confirm_mail)="row">
         <b-button
-          :variant="row.item.firstName === 'Peter' ? 'success' : 'danger'"
+          :variant="row.item.emailChecked ? 'success' : 'danger'"
           size="md"
           :ref="'showing_registermail_detals_' + row.detailsShowing"
-          @click="
-            row.item.firstName !== 'Peter'
-              ? rowDetailsToogleRegisterMail(row, row.detailsShowing)
-              : ''
-          "
+          @click="!row.item.emailChecked ? rowDetailsToogleRegisterMail(row, row.detailsShowing) : ''"
           class="mr-2"
         >
           <b-icon
-            :icon="row.item.firstName === 'Peter' ? 'envelope-open' : 'envelope'"
+            :icon="row.item.emailChecked ? 'envelope-open' : 'envelope'"
             aria-label="Help"
           ></b-icon>
         </b-button>
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 86e333845..4ef32ee1a 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -7,6 +7,7 @@ export const searchUsers = gql`
       lastName
       email
       creation
+      emailChecked
     }
   }
 `
diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index cbf8dd21c..5e7d7f684 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -13,4 +13,7 @@ export class UserAdmin {
 
   @Field(() => [Number])
   creation: number[]
+
+  @Field(() => Boolean)
+  emailChecked: boolean
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 416838c1c..fb596870a 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -17,6 +17,7 @@ import { UserTransaction } from '@entity/UserTransaction'
 import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
 import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
+import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
 
 @Resolver()
 export class AdminResolver {
@@ -32,6 +33,7 @@ export class AdminResolver {
         adminUser.lastName = user.lastName
         adminUser.email = user.email
         adminUser.creation = await getUserCreations(user.id)
+        adminUser.emailChecked = await hasActivatedEmail(user.email)
         return adminUser
       }),
     )
@@ -315,3 +317,10 @@ function isCreationValid(creations: number[], amount: number, creationDate: Date
   }
   return true
 }
+async function hasActivatedEmail(email: string): Promise<boolean> {
+  const repository = getCustomRepository(LoginUserRepository)
+  const user = await repository.findByEmail(email)
+  let emailActivate = false
+  if (user) emailActivate = user.emailChecked
+  return emailActivate
+}