diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
index 6e01ea679..2195e1f7e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
@@ -39,8 +39,8 @@
 public class DefaultCipherService
 {
     private static final Charset UTF_8 = Charset.forName("UTF-8");
-    private static final String HASH_ALGORITHM = "SHA-256";
-    private static final String CIPHER_ALGORITHM = "AES";
+    private static final String HASH_ALGORITHM = "SHA-512";
+    private static final String CIPHER_ALGORITHM = "AES/CFB/PKCS5Padding";
 
     public String setMasterHash(String masterPassword, String masterSalt, boolean overwrite)
         throws IOException