diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index 68dfeb431..9a5109e87 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -16,7 +16,7 @@
 				<div class="col-md-8 ">
 					<div class="form-group form-group-search">
 						<input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
-						<button class="btn btn-default btn-sm form-button-search" type="submit" name="submit" id="contacts-search-submit" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						<button class="btn btn-default btn-sm form-button-search" type="submit" id="contacts-search-submit">{{$submit}}</button>
 					</div>
 				</div>
 				<div class="col-md-2"></div>
diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index 17c77e786..2bdd07a69 100644
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -20,7 +20,7 @@
 			<div class="col-md-8 ">
 				<div class="form-group form-group-search">
 					<input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
-					<button class="btn btn-default btn-sm form-button-search" type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+					<button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
 				</div>
 			</div>
 			<div class="col-md-2"></div>
diff --git a/view/theme/frio/templates/follow.tpl b/view/theme/frio/templates/follow.tpl
index a35bcb213..a37ca854b 100644
--- a/view/theme/frio/templates/follow.tpl
+++ b/view/theme/frio/templates/follow.tpl
@@ -7,7 +7,7 @@
 		{{* The input field - For visual consistence we are using a search input field*}}
 		<div class="form-group form-group-search">
 			<input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value|escape:'html'}}" placeholder="{{$hint|escape:'html'}}" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
-			<button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$follow|escape:'html'}}">{{$follow}}</button>
+			<button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$follow}}</button>
 		</div>
 	</form>
 </div>
diff --git a/view/theme/frio/templates/peoplefind.tpl b/view/theme/frio/templates/peoplefind.tpl
index 6b31c92ad..f84a09450 100644
--- a/view/theme/frio/templates/peoplefind.tpl
+++ b/view/theme/frio/templates/peoplefind.tpl
@@ -8,7 +8,7 @@
 		{{* The search field *}}
 		<div class="form-group form-group-search">
 			<input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
-			<button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$findthem|escape:'html'}}">{{$findthem}}</button>
+			<button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$findthem}}</button>
 		</div>
 	</form>
 
diff --git a/view/theme/frio/templates/searchbox.tpl b/view/theme/frio/templates/searchbox.tpl
index 95673698b..7d6fbef65 100644
--- a/view/theme/frio/templates/searchbox.tpl
+++ b/view/theme/frio/templates/searchbox.tpl
@@ -11,7 +11,7 @@ Some parts of this template will be moved by js to other places (see theme.js) -
 
 					<div class="form-group form-group-search">
 						<input type="text" name="search" id="search-text" class="search-input form-control form-search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$search_label}}" value="{{$s}}" />
-						<button id="search-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$search_label}}">{{$search_label}}</button>
+						<button id="search-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$search_label}}</button>
 					</div>
 
 					<div class="col-md-4"></div>