diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index 51fb7649feae5ad0eae5d9c915b3ad42325f00d9..ae78d7869e3a9f9c9ee79fe95debb30bcfcf6c76 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -183,7 +183,11 @@ public class UserDAO {
      * @return a random salt
      */
     public byte[] generateSalt() {
-        return null;
+    SecureRandom random = new SecureRandom();
+    byte bytes[] = new byte[16];
+    bytes = random.nextBytes(bytes);
+        
+    return bytes;
     }
 
     /**
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index 9d8faca42c5c0fb99df8b9c46dfbb60495123161..95ed0760db7e9125858f7174b321ccabce65f7c2 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -194,4 +194,13 @@ 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