diff --git a/frontend/src/views/CreateTimeTrackAccount.vue b/frontend/src/views/CreateTimeTrackAccount.vue
index f29be58..4900505 100644
--- a/frontend/src/views/CreateTimeTrackAccount.vue
+++ b/frontend/src/views/CreateTimeTrackAccount.vue
@@ -1,5 +1,5 @@
 <template >
-  <v-container>
+  <v-container id = "createAccountListen">
     <v-card align-center>
       <h3 class="text-center display-2 logowhite--text">Details</h3>
 
@@ -79,5 +79,15 @@ export default {
       }
     },
   },
+   mounted() {
+     var listen =  document.getElementById('createAccountListen');
+    listen.addEventListener("keyup", e => {
+      if (e.keyCode === 13) {
+        e.preventDefault();
+
+        this.addAccount();
+      }
+    });
+  }
 };
 </script>
\ No newline at end of file
diff --git a/frontend/src/views/CreateTimerecord.vue b/frontend/src/views/CreateTimerecord.vue
index 1ca494f..0906892 100644
--- a/frontend/src/views/CreateTimerecord.vue
+++ b/frontend/src/views/CreateTimerecord.vue
@@ -1,5 +1,5 @@
 <template >
-  <v-container>
+  <v-container id = "createRecordListen">
     <v-card align-center>
       <h3 class="text-center display-2 logowhite--text">Details</h3>
 
@@ -45,7 +45,7 @@
   </v-container>
 </template>
 <script>
-import { baseUri} from "../variables";
+import { baseUri } from "../variables";
 export default {
   name: "CreateTimeTrackAccount",
   data: () => ({
@@ -58,38 +58,46 @@ export default {
 
   methods: {
     addRecord() {
-        var account ="";
-         var accountxhttp = new XMLHttpRequest();
-        
+      var account = "";
+      var accountxhttp = new XMLHttpRequest();
 
-        accountxhttp.onreadystatechange = function() {
-          if ((this.status == 200) & (this.readyState == 4)) {
-            
-            //account =
-            
-            account =JSON.parse(accountxhttp.responseText)
-           
-            
-            account = account._links.self.href;
-            
-            
-            
-           
-          }
-        };
-        accountxhttp.open("GET", baseUri + "/accounts/search/findByUsernameAndName?username=" + sessionStorage.getItem("username")+ "&account=" +this.accountname, false);
-        accountxhttp.setRequestHeader("Content-Type", "application/json");
+      accountxhttp.onreadystatechange = function() {
+        if ((this.status == 200) & (this.readyState == 4)) {
+          //account =
 
-        accountxhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
-        accountxhttp.send( null );
-     
-        
-      if (this.newstartdate != "" && this.newenddate != "" && this.newdate != "" && account != "" ) {
+          account = JSON.parse(accountxhttp.responseText);
+
+          account = account._links.self.href;
+        }
+      };
+      accountxhttp.open(
+        "GET",
+        baseUri +
+          "/accounts/search/findByUsernameAndName?username=" +
+          sessionStorage.getItem("username") +
+          "&account=" +
+          this.accountname,
+        false
+      );
+      accountxhttp.setRequestHeader("Content-Type", "application/json");
+
+      accountxhttp.setRequestHeader(
+        "Authorization",
+        sessionStorage.getItem("jwt")
+      );
+      accountxhttp.send(null);
+
+      if (
+        this.newstartdate != "" &&
+        this.newenddate != "" &&
+        this.newdate != "" &&
+        account != ""
+      ) {
         var xhttp = new XMLHttpRequest();
         var suc;
         xhttp.onreadystatechange = function() {
           if ((this.status == 201) & (this.readyState == 4)) {
-           suc = true;
+            suc = true;
           }
         };
         xhttp.open("POST", baseUri + "/records", false);
@@ -108,11 +116,22 @@ export default {
             account +
             '"}'
         );
-        if(suc == true){
-          this.$router.push( "/timerecords");
+        if (suc == true) {
+          this.$router.push("/timerecords");
         }
       }
-    },
+    }
   },
+  mounted() {
+        var listen =  document.getElementById('createRecordListen');
+
+    listen.addEventListener("keyup", e => {
+      if (e.keyCode === 13) {
+        e.preventDefault();
+
+        this.addRecord();
+      }
+    });
+  }
 };
 </script>
\ No newline at end of file
diff --git a/frontend/src/views/EditTimeTrackAccount.vue b/frontend/src/views/EditTimeTrackAccount.vue
index c051855..a471547 100644
--- a/frontend/src/views/EditTimeTrackAccount.vue
+++ b/frontend/src/views/EditTimeTrackAccount.vue
@@ -1,5 +1,5 @@
 <template >
-  <v-container>
+  <v-container id = "editAccountListen">
     <v-card align-center>
       <div class="text-center ma-3">
         <h2 class="text-center display-2 logowhite--text">Account to edit:</h2>
@@ -115,6 +115,16 @@ export default {
     this.newrevenue = account.revenue;
     this.newdescription = account.description;
 
+  },
+   mounted() {
+     var listen =  document.getElementById('editAccountListen');
+    listen.addEventListener("keyup", e => {
+      if (e.keyCode === 13) {
+        e.preventDefault();
+
+        this.editAccount();
+      }
+    });
   }
 };
 </script>
\ No newline at end of file
diff --git a/frontend/src/views/EditTimerecord.vue b/frontend/src/views/EditTimerecord.vue
index 2e7c9c1..a0b2b3d 100644
--- a/frontend/src/views/EditTimerecord.vue
+++ b/frontend/src/views/EditTimerecord.vue
@@ -1,5 +1,5 @@
 <template >
-  <v-container>
+  <v-container id="editRecordListen">
    
 
     <v-card align-center>
@@ -111,6 +111,16 @@ export default {
     this.newstartdate = record.startdate;
     this.newenddate = record.enddate;
 
+  },
+   mounted() {
+    var listen =  document.getElementById('editRecordListen');
+    listen.addEventListener("keyup", e => {
+      if (e.keyCode === 13) {
+        e.preventDefault();
+
+        this.editRecord();
+      }
+    });
   }
 };
 </script>
\ No newline at end of file
diff --git a/frontend/src/views/SignIn.vue b/frontend/src/views/SignIn.vue
index a4cfbe4..2dea902 100644
--- a/frontend/src/views/SignIn.vue
+++ b/frontend/src/views/SignIn.vue
@@ -1,5 +1,5 @@
 <template >
-  <v-container class="fill-height">
+  <v-container class="fill-height" id="signInListen">
     <v-row align="center" justify="center">
       <v-col cols="12">
         <v-card elevation="0">
@@ -171,7 +171,8 @@ export default {
     }
   },
   mounted(){
-   window.addEventListener('keyup', (e) => {
+    var listen =  document.getElementById('signInListen');
+   listen.addEventListener('keyup', (e) => {
   if (e.keyCode === 13) {
    e.preventDefault();
    if(this.step==1){