diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index ae78d7869e3a9f9c9ee79fe95debb30bcfcf6c76..a65d345c00c29eb2f97b87fb44f6da9519109116 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -183,11 +183,11 @@ public class UserDAO {
      * @return a random salt
      */
     public byte[] generateSalt() {
-    SecureRandom random = new SecureRandom();
-    byte bytes[] = new byte[16];
-    bytes = random.nextBytes(bytes);
-        
-    return bytes;
+    //SecureRandom random = new SecureRandom();
+    //byte bytes[] = new byte[16];
+    //bytes = random.nextBytes(bytes);
+    return null;
+    //return bytes;
     }
 
     /**
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index 170d03160b13d06eda786184526e2cbd2b65f77f..9d8faca42c5c0fb99df8b9c46dfbb60495123161 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -194,14 +194,4 @@ public class UserDAOTest extends JerseyTest {
         assertEquals(expectedUsername,actualUsername);
         assertNotEquals(beforeNewUser,afterNewUser);
     }
-
-    /** 
-    @Test
-    public void testSalt () {
-        String password = "passord";
-        byte salted1[] = userDAO.generateSalt(password);
-        byte salted2[] = userDAO.generateSalt(password);
-
-        assertNotEquals(salted1, salted2);
-    }*/
 }
\ No newline at end of file