diff --git a/api/src/Framework.php b/api/src/Framework.php
index 91e6b9e7d7..ad096ddef7 100644
--- a/api/src/Framework.php
+++ b/api/src/Framework.php
@@ -1300,8 +1300,8 @@ abstract class Framework extends Framework\Extra
 						'id'    => 'password',
 						'name'  => 'preferences',
 						'title' => lang($types[$type]['title']),
-						'url'   => "javascript:egw.open_link('".
-							self::link('/index.php?menuaction=preferences.preferences_password.change')."','_blank','850x580')",
+						'url'   => 'javascript:egw.open_link("'.
+							self::link('/index.php?menuaction=preferences.preferences_password.change').'","_blank","850x580")',
 					));
 				}
 				break;
diff --git a/pixelegg/js/fw_mobile.js b/pixelegg/js/fw_mobile.js
index 13220f901f..1fd4741433 100644
--- a/pixelegg/js/fw_mobile.js
+++ b/pixelegg/js/fw_mobile.js
@@ -1133,7 +1133,7 @@
 				if (matches.length > 1 && matches[2] !== undefined)
 				{
 					try {
-						args = JSON.parse('['+matches[2]+']');
+						args = JSON.parse('['+decodeURI(matches[2])+']');
 					}
 					catch(e) {	// deal with '-encloded strings (JSON allows only ")
 						args = JSON.parse('['+matches[2].replace(/','/g, '","').replace(/((^|,)'|'(,|$))/g, '$2"$3')+']');