diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
index 63857cd..f9d9ca4 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
@@ -24,10 +24,10 @@
             <q-card class="q-mb-md" v-for="(user) in rankinglist" :key="user.id">
               <q-item class="q-pr-sm ">
                 <q-item-section>
-                  <q-item-label v-if="username === user.username" @click="gotoProfile"><a class="text-green"
+                  <q-item-label v-if="email === user.username" @click="gotoProfile"><a class="text-green"
                                                                                           style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a>
                   </q-item-label>
-                  <q-item-label v-if="username !== user.username"><a class="text-black"
+                  <q-item-label v-if="email !== user.username"><a class="text-black"
                                                                      style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a>
                   </q-item-label>
                 </q-item-section>
@@ -105,7 +105,8 @@
         rankinglist: [],
         teamRankinglist: [],
         username: null,
-        deleteUser: null
+        deleteUser: null,
+        email: null,
       }
     },
     created: function () {
@@ -114,6 +115,7 @@
       this.fetchRankinglist();
       this.fetchTeamRankinglist();
       this.username = JSON.parse(localStorage.getItem('userToken')).name;
+      this.email = JSON.parse(localStorage.getItem('userMail'));
     },
     computed: {
       hasAdminState() {
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index bbf0e1b..2ea87d8 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -425,7 +425,7 @@ public class Controller {
       for (RankingListHelper rankingListHelper: sendBackUsers) {
         logger.debug("RankingList Helper " + rankingListHelper.getUsername());
         logger.debug("User: " + user.getUsername());
-        if(rankingListHelper.getUsername().equals(user.getUsername())){
+        if(rankingListHelper.getUsername().equals(user.getEmail())){
           userAlreadyInRankingList = true;
           break;
         }
@@ -435,7 +435,7 @@ public class Controller {
         ResponseEntity singlePlace = getRankingPlace(user.getEmail());
 
         if (singlePlace.getStatusCodeValue() == 200) {
-          RankingListHelper rankingListHelper = new RankingListHelper(user.getUsername(), (Integer) user_infoRepository.findUser_InfoByUser(user).getRankingPointsSum(), (Integer) getRankingPlace(user.getEmail()).getBody());
+          RankingListHelper rankingListHelper = new RankingListHelper(user.getEmail(), (Integer) user_infoRepository.findUser_InfoByUser(user).getRankingPointsSum(), (Integer) getRankingPlace(user.getEmail()).getBody());
           logger.debug(String.valueOf((Integer) singlePlace.getBody()));
           sendBackUsers.add(rankingListHelper);
         }
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index 9c920fe..a4a04a0 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -20,7 +20,7 @@ public interface UserRepository extends CrudRepository<User, Integer> {
 //      "LIMIT 10;", nativeQuery = true)
 //  List<Object[]> getRankingList();
 
-  @Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" +
+  @Query(value = "SELECT DISTINCT u.id AS ID, u.email AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" +
       "FROM user u,\n" +
       "     user_info ui,\n" +
       "     user_roles ur\n" +