diff --git a/frontend/app/map/lines/view-line.html b/frontend/app/map/lines/view-line.html
index a72c5627..3b6259e7 100644
--- a/frontend/app/map/lines/view-line.html
+++ b/frontend/app/map/lines/view-line.html
@@ -25,7 +25,7 @@
 		</uib-tab>
 	</uib-tabset>
 </div>
-<div class="buttons" ng-if="!readonly">
+<div class="buttons" ng-if="!client.readonly">
 	<button type="button" class="btn btn-default btn-sm" ng-click="edit()">Edit</button>
 	<button type="button" class="btn btn-default btn-sm" ng-click="move()">Move</button>
 	<button type="button" class="btn btn-default btn-sm" ng-click="confirm('Do you really want to remove the line “' + line.name + '”?') && delete()">Remove</button>
diff --git a/frontend/app/map/markers/view-marker.html b/frontend/app/map/markers/view-marker.html
index 11933944..534b8556 100644
--- a/frontend/app/map/markers/view-marker.html
+++ b/frontend/app/map/markers/view-marker.html
@@ -11,10 +11,10 @@
 		<dd ng-repeat-end fm-type-field-content="field" fm-type-field-model="marker.data[field.name]"></dd>
 	</dl>
 </div>
-<div class="buttons" ng-if="!readonly">
-	<button type="button" class="btn btn-default btn-sm" ng-click="edit()">Edit</button>
-	<button type="button" class="btn btn-default btn-sm" ng-click="move()">Move</button>
-	<button type="button" class="btn btn-default btn-sm" ng-click="confirm('Do you really want to remove the marker “' + marker.name + '”?') && delete()">Remove</button>
+<div class="buttons">
+	<button ng-if="!client.readonly" type="button" class="btn btn-default btn-sm" ng-click="edit()">Edit</button>
+	<button ng-if="!client.readonly" type="button" class="btn btn-default btn-sm" ng-click="move()">Move</button>
+	<button ng-if="!client.readonly" type="button" class="btn btn-default btn-sm" ng-click="confirm('Do you really want to remove the marker “' + marker.name + '”?') && delete()">Remove</button>
 	<div ng-if="map.searchUi" uib-dropdown keyboard-nav="true" class="dropup">
 		<button type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>Use as <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu">
diff --git a/frontend/app/map/route/view-route.html b/frontend/app/map/route/view-route.html
index d3a35a0f..1e2359d9 100644
--- a/frontend/app/map/route/view-route.html
+++ b/frontend/app/map/route/view-route.html
@@ -8,7 +8,7 @@
 	</dl>
 	<div class="fm-elevation-plot" ng-show="client.route.ascent != null"></div>
 </div>
-<div class="buttons" ng-if="!readonly">
+<div class="buttons" ng-if="!client.readonly">
 	<div uib-dropdown keyboard-nav="true" ng-if="(client.types | fmPropertyCount:{type:'line'}) > 1" class="dropup">
 		<button id="add-type-button" type="button" class="btn btn-default" uib-dropdown-toggle>Add to map <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="add-type-button" uib-dropdown-menu>
diff --git a/frontend/app/search/result-popup.html b/frontend/app/search/result-popup.html
index 30a011f1..7bfc0393 100644
--- a/frontend/app/search/result-popup.html
+++ b/frontend/app/search/result-popup.html
@@ -15,13 +15,13 @@
 </div>
 <div class="buttons">
 	{{filteredTypes = (result.isMarker && result.isLine ? client.types : (client.types | fmObjectFilter:{type:result.isMarker ? 'marker' : 'line'})); ""}}
-	<div uib-dropdown keyboard-nav="true" ng-if="!readonly && (filteredTypes | fmPropertyCount) > 1" class="dropup">
+	<div uib-dropdown keyboard-nav="true" ng-if="!client.readonly && (filteredTypes | fmPropertyCount) > 1" class="dropup">
 		<button id="add-type-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>Add to map <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="add-type-button">
 			<li role="menuitem" ng-repeat="type in filteredTypes"><a href="javascript:" ng-click="addToMap(type)">{{type.name}}</a></li>
 		</ul>
 	</div>
-	<button type="button" ng-if="!readonly && (filteredTypes | fmPropertyCount) == 1" ng-repeat="type in filteredTypes" class="btn btn-default btn-sm" ng-click="addToMap(type)">Add to map</button>
+	<button type="button" ng-if="!client.readonly && (filteredTypes | fmPropertyCount) == 1" ng-repeat="type in filteredTypes" class="btn btn-default btn-sm" ng-click="addToMap(type)">Add to map</button>
 	<div ng-if="result.isMarker" uib-dropdown keyboard-nav="true" class="dropup">
 		<button type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>Use as <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu">