diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index 2dbad026d6b34dcd1460745fa164309c0d1954fe..e4f8cc1a9c7f48b04548499f48bdf4e637f2d6e5 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -183,14 +183,16 @@ public class UserDAO {
      * @return a random salt
      */
     public byte[] generateSalt() {
+        byte[] bytes = new byte[16];
         try{
-        SecureRandom random = SecureRandom.getInstance("SHA-256");
-        byte[] bytes = new byte[20];
+        SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+
         random.nextBytes(bytes);
-        return bytes;}
+        }
         catch (NoSuchAlgorithmException e){
-            return null;
+            e.printStackTrace();
         }
+        return bytes;
     }
 
     /**
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index 9d8faca42c5c0fb99df8b9c46dfbb60495123161..ea85ca5b92647068bd4277966e9664b696ec7478 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -132,6 +132,7 @@ public class UserDAOTest extends JerseyTest {
         }
     }
 
+
     @After
     public void tearDown () {
         try {