diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 2a93a8f17..5f8258ff8 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -246,8 +246,8 @@ $text .= "<div class='field-spacer'>".$tp->parseTemplate("{IMAGESELECTOR={$parms
 
 $text .= "
 						</td>
-						
-	<tr>
+					</tr>
+					<tr>
 						<td class='label'>".PRFLAN_214."</td>
 						<td class='control'>".$frm->imagepicker('sitelogo',$pref['sitelogo'],'-- No Image --')."</td>
 					</tr>
@@ -401,7 +401,8 @@ $text .= "
 							".$frm->radio_switch('admin_slidedown_subs', $pref['admin_slidedown_subs'])."
 							<div class='smalltext field-help'>".PRFLAN_200."</div>
 						</td>
-                        <tr>
+					</tr>
+					<tr>
 						<td class='label'>".PRFLAN_204."</td>
 						<td class='control'>
 							".$frm->radio_switch('admin_separate_plugins', $pref['admin_separate_plugins'])."
diff --git a/e107_core/shortcodes/single/imageselector.php b/e107_core/shortcodes/single/imageselector.php
index 2702e1bae..0614eb974 100644
--- a/e107_core/shortcodes/single/imageselector.php
+++ b/e107_core/shortcodes/single/imageselector.php
@@ -128,10 +128,10 @@ function imageselector_shortcode($parm = '', $mod = '')
 					}
 				}
 			}
-			$text .= '</optgroup>\n';
+			$text .= "</optgroup>\n";
 		}
 		$text .= "</select>";
-		$text .= "<a href='#'  onclick=\"replaceSC('imageselector=".rawurlencode($parm)."&saction=select',\$('{$name_id}').up('form'),'{$name_id}_cont'); return false;\">refresh</a>";
+		$text .= "<a href='#'  onclick=\"replaceSC('imageselector=".rawurlencode($parm)."&amp;saction=select',\$('{$name_id}').up('form'),'{$name_id}_cont'); return false;\">refresh</a>";
 		if(!e_AJAX_REQUEST) $text .= '</div>';
 
 		if ($scaction == 'select') return $text;