diff --git a/gatling/chat/ChatSimulation.scala b/gatling/chat/ChatSimulation.scala
index 1e70c3bc0bfc3fabb6b6919c8eeabe6482e58c0a..51782700aa620c04c4a6bf72da16e86b279ce9d2 100644
--- a/gatling/chat/ChatSimulation.scala
+++ b/gatling/chat/ChatSimulation.scala
@@ -73,5 +73,5 @@ class ChatSimulation extends Simulation {
                             | "messageContent":"Hei fra gatling"
                             |}""".stripMargin)))
 
-	setUp(scn.inject(atOnceUsers(100))).protocols(httpProtocol)
+	setUp(scn.inject(atOnceUsers(250))).protocols(httpProtocol)
 }
diff --git a/installGatling b/installGatling
old mode 100644
new mode 100755
diff --git a/runGatling b/runGatling
old mode 100644
new mode 100755
diff --git a/src/main/webapp/js/settings.js b/src/main/webapp/js/settings.js
index c143d49f42604f3a929f67138c9283ac0e6e94b6..0e576b05daeeefe943793c816cff10b8bde55e7e 100644
--- a/src/main/webapp/js/settings.js
+++ b/src/main/webapp/js/settings.js
@@ -8,7 +8,10 @@ document.getElementById("cancelButton").addEventListener("click", function(){
  */
 function editUser (event) {
     event.preventDefault();
-    let newInformation = {};
+    let newInformation = {
+        "username": document.getElementById('username').value,
+        "password": document.getElementById('password').value
+    };
 
     fetch('../api/user/'+sessionStorage.getItem("userId"), {
         method: "PUT",
@@ -20,9 +23,20 @@ function editUser (event) {
             if (response === true) {
                 alert("Bruker oppdatert");
                 window.location.href = "../app.html";
+                loadApplication(newInformation);
             } else {
                 alert("Brukernavn eksisterer fra før, vennligst skriv inn et nytt brukernavn");
             }
         })
         .catch(error => console.error(error));
 }
+/**
+ * Adds user information to sessionStorage and redirects to app.html
+ * @param user contains user information as a JSON object
+ */
+ function loadApplication(user){
+    sessionStorage.setItem("userId", user.userId);
+    sessionStorage.setItem("username", user.username);
+    window.location.href = "../app.html"
+
+}
diff --git a/src/test/java/UserResourceTest.java b/src/test/java/UserResourceTest.java
index 2846b35fc961b085b0bb59833efed2dc9b50ecfb..9c8a4f5e77f5ae1f8a340b073dab62a2aa45e96a 100644
--- a/src/test/java/UserResourceTest.java
+++ b/src/test/java/UserResourceTest.java
@@ -42,7 +42,7 @@ public class UserResourceTest extends JerseyTest {
         assertEquals("application/json",output.getHeaderString("Content-type"));
     }
 
-    /*
+    
     @Test
     public void testEditUser () {
         user2.setUserId(10);
@@ -51,5 +51,5 @@ public class UserResourceTest extends JerseyTest {
         assertEquals("Should return status 200", 200, output.getStatus());
         assertEquals("application/json",output.getHeaderString("Content-type"));
         assertNotEquals("testUsername",user2.getUsername());
-    }*/
+    }
 }