diff --git a/urbackup/serverinterface/json.cpp b/urbackup/serverinterface/json.cpp
index 50e7dd68..93913347 100644
--- a/urbackup/serverinterface/json.cpp
+++ b/urbackup/serverinterface/json.cpp
@@ -177,12 +177,34 @@ namespace JSON
 	{
 		init(val);
 	}
+	
+	Value::Value(const char *val)
+	{
+		init(val);
+	}
+	
+	Value::Value(const wchar_t *val)
+	{
+		init(val);
+	}
 
 	void Value::init(void)
 	{
 		data_type=null_type;
 		data=NULL;
 	}
+	
+	void Value::init(const char *val)
+	{
+		data_type=str_type;
+		data=new std::string(val);
+	}
+	
+	void Value::init(const wchar_t *val)
+	{
+		data_type=wstr_type;
+		data=new std::wstring(val);
+	}
 
 	void Value::init(const std::string &val)
 	{
diff --git a/urbackup/serverinterface/json.h b/urbackup/serverinterface/json.h
index 65931dcf..559f6401 100644
--- a/urbackup/serverinterface/json.h
+++ b/urbackup/serverinterface/json.h
@@ -72,13 +72,19 @@ namespace JSON
 		Value(const std::string &val);
 		Value(const std::wstring &val);
 		Value(const Object &val); 
-		Value(const Array &val);
+		Value(const Array &val)
+		
+		
+		
+		;
 		Value(bool val);
 		Value(int val);
 		Value(unsigned int val);
 		Value(_i64 val);
 		Value(uint64 val);
 		Value(double val);
+		Value(const char* val);
+		Value(const wchar_t* val);
 		~Value();
 
 		Value & operator=(const Value &other);
@@ -111,6 +117,8 @@ namespace JSON
 		void init(_i64 val);
 		void init(uint64 val);
 		void init(double val);
+		void init(const char* val);
+		void init(const wchar_t* val);
 
 		std::string escape(const std::string &t);
 
diff --git a/urbackup/serverinterface/settings.cpp b/urbackup/serverinterface/settings.cpp
index 7df0e195..ad000cbc 100644
--- a/urbackup/serverinterface/settings.cpp
+++ b/urbackup/serverinterface/settings.cpp
@@ -521,6 +521,13 @@ ACTION_IMPL(settings)
 				obj.set("max_active_clients", settings.max_active_clients);
 				obj.set("tmpdir", settings.tmpdir);
 				obj.set("cleanup_window", settings.cleanup_window);
+				#ifdef _WIN32
+				obj.set("ONLY_WIN32_BEGIN","");
+				obj.set("ONLY_WIN32_END","");
+				#else
+				obj.set("ONLY_WIN32_BEGIN","<!--");
+				obj.set("ONLY_WIN32_END","-->");
+				#endif //_WIN32
 
 				ret.set("settings", obj);
 			}
diff --git a/urbackup/www/urbackup.js b/urbackup/www/urbackup.js
index 7c1df177..7039382c 100644
--- a/urbackup/www/urbackup.js
+++ b/urbackup/www/urbackup.js
@@ -882,6 +882,9 @@ function show_settings2(data)
 			data.settings.no_compname_end="-->";
 			
 			data.settings.client_plural="s";
+			
+			data.settings.ONLY_WIN32_BEGIN=unescapeHTML(data.settings.ONLY_WIN32_BEGIN);
+			data.settings.ONLY_WIN32_END=unescapeHTML(data.settings.ONLY_WIN32_END);
 			
 			data.settings.settings_inv=tmpls.settings_inv_row.evaluate(data.settings);
 			ndata+=tmpls.settings_general.evaluate(data.settings);