diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc
index 8d0e5374c1..ac58350031 100644
--- a/src/etc/inc/service-utils.inc
+++ b/src/etc/inc/service-utils.inc
@@ -490,13 +490,13 @@ function get_service_control_links($service, $addname = false) {
 
 	switch ($service['name']) {
 		case "openvpn":
-			$link = '<a title="%s" href="status_services.php?mode=%s&amp;service='.$service['name'].'.&amp;vpnmode='.$service['mode'].'.&amp;id='.$service['vpnid'].'">';
+			$link = '<a title="%s" href="status_services.php?mode=%s&amp;service='.$service['name'] . '&amp;vpnmode=' . $service['mode'] . '&amp;id=' . $service['vpnid'] . '">';
 		break;
 		case "captiveportal":
-			$link = '<a title="%s" href="status_services.php?mode=%s&amp;service='.$service['name'].'.&amp;zone='.$service['zone'].'">';
+			$link = '<a title="%s" href="status_services.php?mode=%s&amp;service=' . $service['name'] . '&amp;zone=' . $service['zone'] . '">';
 		break;
 		default:
-			$link = '<a title="%s" href="status_services.php?mode=%s&amp;service='.$service['name'].'">';
+			$link = '<a title="%s" href="status_services.php?mode=%s&amp;service=' . $service['name'] . '">';
 	}
 
 	if (get_service_status($service)) {
@@ -521,7 +521,7 @@ function get_service_control_links($service, $addname = false) {
 			default:
 				$output .= "<a href='status_services.php?mode=stopservice&amp;service={$service['name']}'>";
 		}
-		$output .= "<img style=\"vertical-align:middle\" title='" . sprintf(gettext("Stop %sService"), $stitle) . "' border='0' src='/themes/".$g['theme']."/images/icons/icon_service_stop.gif' alt='stop' />";
+		$output .= "<img style=\"vertical-align:middle\" title='" . sprintf(gettext("Stop %sService"), $stitle) . "' border='0' src='/themes/" . $g['theme'] . "/images/icons/icon_service_stop.gif' alt='stop' />";
 		$output .= "</a>";
 	} else {
 		$service_enabled = is_service_enabled($service['name']);