diff --git a/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh b/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh
index a3a2732cd2b..294eab0cb85 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh
@@ -48,7 +48,7 @@ replace_in_file() {
 get_value() {
   local filename=$1
   local keyname=$2
-  grep -i $keyname= $filename | cut -d= -f2
+  grep -i "^$keyname=" $filename | cut -d= -f2
 }
 
 ip=$1
@@ -70,7 +70,7 @@ do
 	fi
 done
 
-# echo -e \"\\\"HTTP/1.0 200 OK\\\nDocumentType: text/plain\\\n\\\n\\\"\"; 
+echo -ne "HTTP/1.0 200 OK\r\nDocumentType: text/plain\r\n\r\n"
 
 if [ "$request" == "send_my_password" ]
 then
@@ -98,6 +98,4 @@ else
 	fi
 fi
 
-# echo -e \"\\\"\\\n\\\"\"
-
 unlock_exit 0 $lock $locked