diff --git a/app/views/profile_editor/_organization.rhtml b/app/views/profile_editor/_organization.rhtml
index 7e0a9a1..6676f3c 100644
--- a/app/views/profile_editor/_organization.rhtml
+++ b/app/views/profile_editor/_organization.rhtml
@@ -17,7 +17,7 @@
 <% if @environment.enabled?('enable_organization_url_change') %>
   <script type="text/javascript">
     function submit_button() {
-       return $("profile_data_identifier").form.select("input.submit")[0];
+       return $("profile-data").select("input.submit")[0];
     }
     function warn_value_change() {
        show_warning('profile-identifier-formitem', "identifier-change-confirmation");
diff --git a/features/edit_profile.feature b/features/edit_profile.feature
index 8df1446..2c36f07 100644
--- a/features/edit_profile.feature
+++ b/features/edit_profile.feature
@@ -55,3 +55,41 @@ Feature: edit profile
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
+
+  @selenium
+  Scenario: Alert about url change
+    Given the following community
+      | identifier | name | owner |
+      | o-rappa | O Rappa | joao  |
+    And feature "enable_organization_url_change" is enabled on environment
+    When I go to O Rappa's control panel
+    And I follow "Community Info and settings" and wait
+    Then I should not see "WARNING! You are about to change the address"
+    When I fill in "Address" with "banda-o-rappa"
+    Then I should see "WARNING! You are about to change the address"
+
+  @selenium
+  Scenario: Confirm url change
+    Given the following community
+      | identifier | name | owner |
+      | o-rappa | O Rappa | joao  |
+    And feature "enable_organization_url_change" is enabled on environment
+    When I go to O Rappa's control panel
+    And I follow "Community Info and settings" and wait
+    When I fill in "Address" with "banda-o-rappa"
+    Then I should see "WARNING! You are about to change the address"
+    When I follow "Yes"
+    Then I should not see "WARNING! You are about to change the address"
+
+  @selenium
+  Scenario: Cancel url change
+    Given the following community
+      | identifier | name | owner |
+      | o-rappa | O Rappa | joao  |
+    And feature "enable_organization_url_change" is enabled on environment
+    When I go to O Rappa's control panel
+    And I follow "Community Info and settings" and wait
+    When I fill in "Address" with "banda-o-rappa"
+    Then I should see "WARNING! You are about to change the address"
+    When I follow "No"
+    Then I should not see "WARNING! You are about to change the address"
--
libgit2 0.21.2