diff --git a/app/views/profile/show.html.erb b/app/views/profile/show.html.erb
index 781f8b8ea81..a251fafa089 100644
--- a/app/views/profile/show.html.erb
+++ b/app/views/profile/show.html.erb
@@ -14,7 +14,7 @@
       <dd><%= l(@profile.created_at) %></dd>
       <dt><%= ts("My user ID is:") %></dt>
       <dd><%= @user.id %></dd>
-      <% if @profile.location %>
+      <% if @profile.location.present? %>
         <dt class="location"><%=h ts("I live in:") %></dt>
         <dd><%=h @profile.location %></dd>
       <% end %>
diff --git a/features/other_a/profile_edit.feature b/features/other_a/profile_edit.feature
index 62c61c8ba51..4f6186226ca 100644
--- a/features/other_a/profile_edit.feature
+++ b/features/other_a/profile_edit.feature
@@ -17,18 +17,21 @@ Scenario: Add details
   When I fill in the details of my profile
   Then I should see "Your profile has been successfully updated"
     And 0 emails should be delivered
+    And I should see "I live in"
 
 Scenario: Change details
 
   When I change the details in my profile
   Then I should see "Your profile has been successfully updated"
     And 0 emails should be delivered
+    And I should see "I live in"
 
 Scenario: Remove details
 
   When I remove details from my profile
   Then I should see "Your profile has been successfully updated"
     And 0 emails should be delivered
+    And I should not see "I live in"
 
 Scenario: Change details as an admin