diff --git a/src/main/java/com/erudika/scoold/controllers/AdminController.java b/src/main/java/com/erudika/scoold/controllers/AdminController.java
index 6a6513de..a9ab7982 100755
--- a/src/main/java/com/erudika/scoold/controllers/AdminController.java
+++ b/src/main/java/com/erudika/scoold/controllers/AdminController.java
@@ -542,6 +542,8 @@ public String saveConfig(@RequestParam String key, @RequestParam(defaultValue =
 		if (utils.isAdmin(authUser) && CONF.configEditingEnabled()) {
 			if ("on".equals(value)) {
 				value = "true";
+			} else if ("true".equals(req.getParameter("isbool")) && StringUtils.isBlank(value)) {
+				value = "false";
 			}
 			if (value != null && !StringUtils.isBlank(value)) {
 				System.setProperty(key, value);
diff --git a/src/main/resources/templates/admin.vm b/src/main/resources/templates/admin.vm
index 29d230ca..a6facf6e 100755
--- a/src/main/resources/templates/admin.vm
+++ b/src/main/resources/templates/admin.vm
@@ -367,16 +367,18 @@
 											<div class="col s12 m10">
 												#set($pk = $pkey.substring(7))
 												#set($propval = $configMap.getConfigValue($pk, ""))
-												#if(!$propval || $propval.isEmpty())
+												#set($isbool = $configMetadata.get($key).get($pkey).type == "Boolean")
+												#if(!$isbool && (!$propval || $propval.isEmpty()))
 													#set($propval = $configMetadata.get($key).get($pkey).defaultValue)
 												#end
 												<input name="key" type="hidden" value="$pkey">
 
-												#if($configMetadata.get($key).get($pkey).type == "Boolean")
+												#if($isbool)
 												<label>
 													<input name="value" type="checkbox" #if($propval == "true")checked="checked"#end class="filled-in">
 													<span data-on="$!lang.get('on')" data-off="$!lang.get('off')">#if($propval == "true")$!lang.get('on')#else$!lang.get('off')#end</span>
 												</label>
+												<input name="isbool" type="hidden" value="true">
 												#else
 												<div class="input-field mbn">
 													#if(($pk.contains("secret") || $pk.contains("password") || $pk.contains("privatekey") || $pk.contains("pass")) &&
diff --git a/src/main/resources/templates/macro.vm b/src/main/resources/templates/macro.vm
index 095e0c0d..ae7b93e0 100755
--- a/src/main/resources/templates/macro.vm
+++ b/src/main/resources/templates/macro.vm
@@ -96,7 +96,7 @@
 <div class="col s12 m6 l3 spacebox">
 	<div class="card-panel z-depth-0 lightborder">
 		<div class="row mbn viewbox valign-wrapper">
-			<div class="col s12 m8 columns ">
+			<div class="col s12 m11 columns ">
 				#if($isDefaultSpacePublic && $scooldUtils.isDefaultSpace($space.name))
 				<i class="fa fa-unlock green-text tooltipped" data-tooltip="This space is public"></i>
 				#else
@@ -112,7 +112,7 @@
 				#end
 				<a href="$questionslink/space/$!space.id" class="space-name-box" title="$!{spaceName}">$!{spaceName}</a>
 			</div>
-			<div class="col s12 m4 columns right-align">
+			<div class="col s12 m1 columns right-align">
 				#if(!$scooldUtils.isDefaultSpace($space.name))
 				<a href="#" title="$!lang.get('edit')" class="editlink"><i class="fa fa-pencil-square orange-text"></i></a>
 				#end