diff --git a/app/views/cms/_blog.html.erb b/app/views/cms/_blog.html.erb
index 3a8c5be..19e0a76 100644
--- a/app/views/cms/_blog.html.erb
+++ b/app/views/cms/_blog.html.erb
@@ -4,25 +4,40 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, '#article_slug')") %>
 
 <%= render :partial => 'general_fields' %>
 
 <script type="text/javascript">
+ "use strict";
+
   function submit_button(index) {
-    var form = $($("#article_slug")[0].form)
-     return form.find("input[type=submit]")[index];
+    var form = $($("#article_slug")[0].form);
+    return form.find("input[type=submit]")[index];
   }
+
   function warn_value_change() {
-     show_warning('article-formitem', "slug-change-confirmation");
-     disable_button(submit_button(0));
-     disable_button(submit_button(1));
+    var slug_val = jQuery("#article_slug").val();
+    var old_slug = jQuery("#old_article_slug").val();
+
+    if(old_slug == ""){
+      jQuery("#old_article_slug").val(jQuery("#article_slug").val());
+    }else{
+      if(old_slug != slug_val){
+        show_warning('article-formitem', "slug-change-confirmation");
+        disable_button(submit_button(0));
+        disable_button(submit_button(1));
+      }else{}
+    }
   }
+
   function confirm_change() {
      enable_button(submit_button(0));
      enable_button(submit_button(1));
      hide_warning('slug-change-confirmation');
+     jQuery("#old_article_slug").val(jQuery("#article_slug").val());
   }
+
   function no_change() {
      jQuery("#article_slug").val(jQuery("#old_article_slug").val());
      enable_button(submit_button(0));
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3206d8d..65a2318 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -107,15 +107,13 @@ function convToValidEmail( str ) {
 }
 
 function updateUrlField(name_field, id) {
-   url_field = $(id);
-   old_url_value = url_field.value;
-   new_url_value = convToValidIdentifier(name_field.value, "-");
+   var url_field = $(id);
+   var old_url_value = url_field.val();
+   var new_url_value = convToValidIdentifier(name_field.value, "-");
 
-   url_field.value = new_url_value;
+   url_field.val(new_url_value);
 
-   if (!/^\s*$/.test(old_url_value)
-       && old_url_value != new_url_value
-       ) {
+   if (old_url_value != new_url_value) {
      warn_value_change(url_field);
    }
 }
--
libgit2 0.21.2