diff --git a/os-amq-launch/added/configure.sh b/os-amq-launch/added/configure.sh
index 8c94d844..6be0ffe9 100644
--- a/os-amq-launch/added/configure.sh
+++ b/os-amq-launch/added/configure.sh
@@ -115,9 +115,13 @@ function configureSSL() {
     keyStorePath="$sslDir/$keyStoreFile"
     trustStorePath="$sslDir/$trustStoreFile"
 
+    if [ -n "$AMQ_KEY_PASSWORD" ]; then
+      keyPassword="keyStoreKeyPassword=\"$AMQ_KEY_PASSWORD\""
+    fi
+
     sslElement="<sslContext>\n\
             <sslContext keyStore=\"file:$keyStorePath\"\n\
-                        keyStorePassword=\"$keyStorePassword\"\n\
+                        keyStorePassword=\"$keyStorePassword\" $keyPassword \n\
                         trustStore=\"file:$trustStorePath\"\n\
                         trustStorePassword=\"$trustStorePassword\" />\n\
         </sslContext>"