diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
index bbc0dd7..c314f68 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
@@ -64,6 +64,12 @@ public class PropertiesBackingEngine implements BackingEngine {
         //If encryption support is enabled, encrypt password
         if (encryptionSupport != null && encryptionSupport.getEncryption() != null) {
             newPassword = encryptionSupport.getEncryption().encryptPassword(password);
+            if (encryptionSupport.getEncryptionPrefix() != null) {
+                newPassword = encryptionSupport.getEncryptionPrefix() + newPassword;
+            }
+            if (encryptionSupport.getEncryptionSuffix() != null) {
+                newPassword = newPassword + encryptionSupport.getEncryptionSuffix();
+            }
         }
 
         String userInfos = (String) users.get(username);