diff --git a/src/templates/default/module/server/server/list.tpl.html b/src/templates/default/module/server/server/list.tpl.html
index 08e64db3..229eeea9 100644
--- a/src/templates/default/module/server/server/list.tpl.html
+++ b/src/templates/default/module/server/server/list.tpl.html
@@ -23,7 +23,7 @@
 			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.type }}</div></td>
 			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.rtime }} s</div></td>
 			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.last_online }}</div></td>
-			<td class="tight hidden-phone"><div class="table-cell-title"><i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i></div></td>
+			<td class="tight hidden-phone"><div class="table-cell-title"><i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i> <i class="{{ server.pushsafer_icon }}" title="Pushsafer"></i></div></td>
 			<td class="tight hidden-phone">
 				<div class="table-cell-title">
 					<a class="btn btn-small" href="{{ server.url_view|raw }}"><i class="icon-chart"></i></a>
@@ -51,7 +51,7 @@
 					<div class="table-row">
 						<div class="table-cell"><i class="{{ server.type_icon }}" title="{{ server.type }}"></i> {{ server.ip_short|raw }}</div>
 						<div class="table-cell tight">
-							<i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i>
+							<i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"> <i class="{{ server.pushsafer_icon }}" title="Pushsafer"></i>
 						</div>
 					</div>
 				</div>
diff --git a/src/templates/default/module/server/server/update.tpl.html b/src/templates/default/module/server/server/update.tpl.html
index 4f26e357..43854dd5 100644
--- a/src/templates/default/module/server/server/update.tpl.html
+++ b/src/templates/default/module/server/server/update.tpl.html
@@ -139,6 +139,17 @@
 				</select>
 			</div>
 		</div>
+		<div class="control-group {{ control_class_pushsafer }}">
+			<label class="control-label" for="pushsafer">{{ label_pushsafer }}
+			{% if warning_pushsafer %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_pushsafer }}"></i></p> {% endif %}
+			</label>
+			<div class="controls">
+				<select id="pushsafer" name="pushsafer">
+					<option value="yes" {{ edit_pushsafer_selected_yes|raw }}>{{ label_yes }}</option>
+					<option value="no" {{ edit_pushsafer_selected_no|raw }}>{{ label_no }}</option>
+				</select>
+			</div>
+		</div>
 	</fieldset>
 
 	<fieldset>
diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html
index 17dad262..4498ebb0 100644
--- a/src/templates/default/module/server/server/view.tpl.html
+++ b/src/templates/default/module/server/server/view.tpl.html
@@ -69,6 +69,10 @@
 			<td>{{ label_pushover }}:</td>
 			<td>{{ pushover }}</td>
 		</tr>
+		<tr>
+			<td>{{ label_pushsafer }}:</td>
+			<td>{{ pushsafer }}</td>
+		</tr>
 		<tr>
 			<td>{{ label_timeout }}:</td>
 			<td>{{ timeout }} s</td>