diff --git a/templates/client/includes/accounts/current_user.html b/templates/client/includes/accounts/current_user.html
index 36bc5074..1b4ff88f 100644
--- a/templates/client/includes/accounts/current_user.html
+++ b/templates/client/includes/accounts/current_user.html
@@ -74,8 +74,7 @@
                     <div class="i-place p-editable editable-wrap hidden"> <!-- 2 -->
 
 						<span class="static-value"> <!-- 3 -->
-							<span id="static-home-country">{{ home_form.instance.country }}</span>
-							, <span id="static-home-city">{{ home_form.instance.city }}</span>
+							<span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
 
 						</span>
 
diff --git a/templates/client/includes/company/company_edit.html b/templates/client/includes/company/company_edit.html
index 3a1300ff..ade205d7 100644
--- a/templates/client/includes/company/company_edit.html
+++ b/templates/client/includes/company/company_edit.html
@@ -71,8 +71,7 @@
 					</div>
 					<div class="i-place p-editable editable-wrap hidden">
 					<span class="static-value">
-						<span><a href="#" id="static-home-country">{{ home_form.instance.country }}</a></span>
-						,<span><a href="#" id="static-home-city">{{ home_form.instance.city }}</a></span>
+						<span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
 					</span>