diff --git a/app/views/admin/notes/new.html.erb b/app/views/admin/notes/new.html.erb
index 1918d34bb7..745aa026b3 100644
--- a/app/views/admin/notes/new.html.erb
+++ b/app/views/admin/notes/new.html.erb
@@ -17,15 +17,15 @@
         <%= check_box 'note', 'push_to_twitter', {:disabled => disabled}  %>
         <%= _("POSSE to Twitter")%>
       </label>
-      <label for="note_in_reply_to"><%= _("In reply to")%></label>
+      <label for="note_in_reply_to_status_id"><%= _("In reply to")%></label>
       <%= text_field 'note', 'in_reply_to_status_id', :class => 'input-block-level', :placeholder => _("tweet id like 123456"), :disabled => disabled %>
-      <label for="status_permalink"><%= _("Permanent link")%></label>
+      <label for="note_permalink"><%= _("Permanent link")%></label>
       <%= text_field 'note', 'permalink', :class => 'input-block-level' %>
       <label for='note_published' class='checkbox'>
         <%= check_box 'note', 'published'  %>
         <%= _("Published") %>                    
       </label>
-      <label><%= _("Publish at") %></label>
+      <label for='note_published_at'><%= _("Publish at") %></label>
       <%= calendar_date_select 'note', 'published_at', {:class => 'span11'} %>
       </fieldset>
       <div class='pull-right'>
diff --git a/app/views/admin/seo/index.html.erb b/app/views/admin/seo/index.html.erb
index a0d2e4d4a3..45b7dbe298 100644
--- a/app/views/admin/seo/index.html.erb
+++ b/app/views/admin/seo/index.html.erb
@@ -33,7 +33,7 @@
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="setting_rss_description"><%= _("RSS description message")%></label>
+    <label class='control-label' for="setting_rss_description_text"><%= _("RSS description message")%></label>
     <div class='controls'>
       <%= text_area(:setting, :rss_description_text, :rows => 10, :class => 'span6')%>
       <p class='help-block'>You can use the following tags: %author% (author name), %blog_url% (this blog URL), %blog_name% (this blog title) and %permalink_url% (a link to the article you want to protect)</p>
diff --git a/app/views/admin/seo/permalinks.html.erb b/app/views/admin/seo/permalinks.html.erb
index 579620bb66..e0934fe009 100644
--- a/app/views/admin/seo/permalinks.html.erb
+++ b/app/views/admin/seo/permalinks.html.erb
@@ -11,21 +11,21 @@
   <div class='control-group'>
     <label class='control-label'><%= _("Permalink format") %></label>
     <div class='controls'>
-      <label class='radio' for="setting_permalink_format">
+      <label class='radio' for="setting_permalink_format_yearmonthdaytitle">
         <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%day%/%title%') %> 
         <%= _("Date and title") %>
         <span class='help-block'><%= "#{this_blog.base_url}/#{Time.now.strftime('%Y/%m/%d')}/sample-article" %></span>
       </label>
-      <label class='radio' for="setting_permalink_format">
+      <label class='radio' for="setting_permalink_format_yearmonthtitle">
         <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%title%') %> 
         <%= _("Month and title") %>
         <span class='help-block'><%= "#{this_blog.base_url}/#{Time.now.strftime('%Y/%m')}/sample-article" %></span>
       </label>
-      <label class='radio' for="setting_permalink_format">
+      <label class='radio' for="setting_permalink_format_title">
         <%= radio_button(:setting, :permalink_format, '/%title%') %> <%= _("Title only") %>
         <span class='help-block'><%= "#{this_blog.base_url}/sample-article" %></span>
       </label>
-      <label class='radio' for="setting_custom_permalink">
+      <label class='radio' for="setting_permalink_format_custom">
         <%= radio_button(:setting, :permalink_format, 'custom') %> <%= _("Custom") %>
         <%= text_field(:setting, :custom_permalink, { :class => 'span5 '})%>
       </label>
diff --git a/app/views/admin/seo/titles.html.erb b/app/views/admin/seo/titles.html.erb
index 9f48174ba8..f3b2b2a0f8 100644
--- a/app/views/admin/seo/titles.html.erb
+++ b/app/views/admin/seo/titles.html.erb
@@ -8,13 +8,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Home") %></legend>
   <div class='control-group'>
-    <label class='control-label' for="home_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_home_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :home_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="home_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_home_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :home_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -23,13 +23,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Articles") %></legend>
   <div class='control-group'>
-    <label class='control-label' for="article_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_article_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :article_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="article_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_article_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :article_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -38,13 +38,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Pages") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="page_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_page_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :page_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="page_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_page_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :page_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -54,13 +54,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Paginated archives") %></legend>
   <div class='control-group'>
-    <label class='control-label' for="paginated_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_paginated_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :paginated_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="paginated_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_paginated_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :paginated_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -69,13 +69,13 @@
   <fieldset class='form-horizontal'>
   <legend><%= _("Dated archives") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="archives_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_archives_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :archives_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="archives_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_archives_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :archives_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -85,13 +85,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Categories") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="category_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_category_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :category_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="category_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_category_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :category_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -100,13 +100,13 @@
   <fieldset class='form-horizontal'>
   <legend><%= _("Tags") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="tag_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_tag_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :tag_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="tag_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_tag_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :tag_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -116,13 +116,13 @@
 <fieldset class='form-horizontal'>
     <legend><%= _("Author page") %></legend>    
     <div class='control-group'>
-      <label class='control-label' for="author_title_template"><%= _("Title template") %></label>
+      <label class='control-label' for="setting_author_title_template"><%= _("Title template") %></label>
       <div class='controls'>
         <%= text_field(:setting, :author_title_template, { :class => 'span5'})%>
       </div>
     </div>
     <div class='control-group'>
-      <label class='control-label' for="author_desc_template"><%= _("Description template") %></label>
+      <label class='control-label' for="setting_author_desc_template"><%= _("Description template") %></label>
       <div class='controls'>
         <%= text_area(:setting, :author_desc_template, :rows => 3, :class => 'span5')%>
       </div>
@@ -132,13 +132,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Search results") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="search_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_search_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :search_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="search_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_search_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :search_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -148,13 +148,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Short statuses lists") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="statuses_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_statuses_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :statuses_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="statuses_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_statuses_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :statuses_desc_template, :rows => 3, :class => 'span5')%>
     </div>
@@ -164,13 +164,13 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Short statuses") %></legend>    
   <div class='control-group'>
-    <label class='control-label' for="status_title_template"><%= _("Title template") %></label>
+    <label class='control-label' for="setting_status_title_template"><%= _("Title template") %></label>
     <div class='controls'>
       <%= text_field(:setting, :status_title_template, { :class => 'span5'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="status_desc_template"><%= _("Description template") %></label>
+    <label class='control-label' for="setting_status_desc_template"><%= _("Description template") %></label>
     <div class='controls'>
       <%= text_area(:setting, :status_desc_template, :rows => 3, :class => 'span5')%>
     </div>
diff --git a/app/views/admin/settings/display.html.erb b/app/views/admin/settings/display.html.erb
index 432f06f986..1cc0d3081f 100644
--- a/app/views/admin/settings/display.html.erb
+++ b/app/views/admin/settings/display.html.erb
@@ -22,27 +22,27 @@
     <div class='control-group'>
       <label class='control-label'><%= _("Date format")%></label>
       <div class='controls'>
-        <label class='radio' for="setting_date_format_1">
+        <label class='radio' for="setting_date_format_dmy">
           <%= radio_button(:setting, :date_format, '%d/%m/%Y')%>
           <span><%= Time.now.strftime('%d/%m/%Y') %></span>
         </label>
-        <label class='radio' for="setting_date_format_2">
+        <label class='radio' for="setting_date_format_mdy">
           <%= radio_button(:setting, :date_format, '%m/%d/%Y') %>
           <span><%= Time.now.strftime('%m/%d/%Y') %></span>
         </label>
-        <label class='radio' for="setting_date_format_3">
+        <label class='radio' for="setting_date_format_d_b_y">
           <%= radio_button(:setting, :date_format, "%d %b %Y" )%>
           <span><%= Time.now.strftime('%d %b %Y') %></span>
         </label>
-        <label class='radio' for="setting_date_format_4">
+        <label class='radio' for="setting_date_format_d_b_y">
           <%= radio_button(:setting, :date_format, '%d %B %Y' )%>
           <span><%= Time.now.strftime('%d %B %Y') %></span>
         </label>
         <label class='radio' for="setting_date_format_4">
-          <%= radio_button(:setting, :date_format, 'distance_of_time_in_words' )%>
+          <%= radio_button(:setting, :date_format, 'setting_date_format_distance_of_time_in_words' )%>
           <span><%= distance_of_time_in_words(Time.now, Time.now - 2.days) %> <%= _("ago") %></span>
         </label>
-        <label class='radio' for="setting_date_format_4">
+        <label class='radio' for="setting_date_format_ymd">
           <%= radio_button(:setting, :date_format, '%Y/%m/%d' )%>
           <span><%= Time.now.strftime('%Y/%m/%d') %></span>
         </label>
@@ -51,22 +51,22 @@
     <div class='control-group'>
       <label class='control-label'><%= _("Time format")%></label>
       <div class='controls'>
-        <label class='radio' for="setting_time_format_1">
+        <label class='radio' for="setting_time_format_hhm">
           <span><%= Time.now.strftime('%Hh%M') %></span>
           <%= radio_button(:setting, :time_format, '%Hh%M')%>
         </label>
-        <label class='radio' for="setting_time_format_2">
+        <label class='radio' for="setting_time_format_hm">
           <%= radio_button(:setting, :time_format, '%H:%M')%>
           <span><%= Time.now.strftime('%H:%M') %></span>
         </label>
-        <label class='radio' for="setting_time_format_3">
+        <label class='radio' for="setting_time_format_imp">
           <%= radio_button(:setting, :time_format, '%I:%M%p')%>
           <span><%= Time.now.strftime('%I:%M%p') %></span>
         </label>
       </div>
     </div>
     <div class='control-group'>
-      <label class='control-label' for="custom_url_shortener"><%= _("Custom URL shortener domain")%></label>
+      <label class='control-label' for="setting_custom_url_shortener"><%= _("Custom URL shortener domain")%></label>
       <div class='controls'>
         <%= text_field(:setting, :custom_url_shortener, { :class => 'span6'})%>
         <p class='help block'><%= _("You may want to use a custom domain for URL shortening, here's where it happens.") %></p>
diff --git a/app/views/admin/settings/feedback.html.erb b/app/views/admin/settings/feedback.html.erb
index dfc1526da6..73816c9cd8 100644
--- a/app/views/admin/settings/feedback.html.erb
+++ b/app/views/admin/settings/feedback.html.erb
@@ -42,9 +42,9 @@
       </div>
     </div>
     <div class='control-group'>
-      <label class='control-label' for="setting_use_gravatar"><%= _("Avatars provider")%></label>
+      <label class='control-label' for="setting_plugin_avatar"><%= _("Avatars provider")%></label>
       <div class='controls'>
-        <select name="setting[plugin_avatar]" id="plugin_avatar">
+        <select name="setting[plugin_avatar]" id="setting_plugin_avatar">
           <%= options_for_select plugin_options(:avatar), this_blog.plugin_avatar %>
         </select>
       </div>
@@ -89,7 +89,7 @@
   <div class='control-group'>
     <label class='control-label'><%= _("Captcha") %></label>  
     <div class='controls'>
-      <label class='checkbox' for="setting_recaptcha"><%= _("Enable reCaptcha") %>
+      <label class='checkbox' for="setting_use_recaptcha"><%= _("Enable reCaptcha") %>
         <%= check_box(:setting, :use_recaptcha)%>
         <span class='help-block'><%= _("Remember to set your reCaptcha keys inside config/initializers/recaptcha.rb")%></span>
       </label>
diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb
index f2414b5f4f..a3f17443bb 100644
--- a/app/views/admin/settings/index.html.erb
+++ b/app/views/admin/settings/index.html.erb
@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class='control-group'>
-      <label class='control-label' for="base_url"><%= _("Blog URL")%></label>
+      <label class='control-label' for="setting_base_url"><%= _("Blog URL")%></label>
       <div class='controls'>
         <%= text_field(:setting, :base_url, {:size => this_blog.base_url.length, :class => 'span6'})%>
       </div>
diff --git a/app/views/admin/settings/write.html.erb b/app/views/admin/settings/write.html.erb
index 24346f582d..32b5885add 100644
--- a/app/views/admin/settings/write.html.erb
+++ b/app/views/admin/settings/write.html.erb
@@ -30,7 +30,7 @@
 <fieldset class='form-horizontal'>
   <legend><%= _("Media")%></legend>
   <div class='control-group'>
-    <label class='control-label' for="image_thumb_size"><%= _("Image thumbnail size")%></label>
+    <label class='control-label' for="setting_image_thumb_size"><%= _("Image thumbnail size")%></label>
     <div class='controls'>
       <div class='input-append'>
         <%= text_field(:setting, :image_thumb_size, { :class => 'span3'})%><span class='add-on'>px</span>
@@ -38,7 +38,7 @@
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="image_medium_size"><%= _("Image medium size")%></label>
+    <label class='control-label' for="setting_image_medium_size"><%= _("Image medium size")%></label>
     <div class='controls'>
       <div class='input-append'>
         <%= text_field(:setting, :image_medium_size, { :class => 'span3'})%><span class='add-on'>px</span>
@@ -52,13 +52,13 @@
   <% disabled = (this_blog.has_twitter_configured?) ? false : true %>
   <%= twitter_disabled_message(disabled) %>
   <div class='control-group'>
-    <label class='control-label' for="twitter_consumer_key"><%= _("Twitter consumer key")%></label>
+    <label class='control-label' for="setting_twitter_consumer_key"><%= _("Twitter consumer key")%></label>
     <div class='controls'>
       <%= text_field(:setting, :twitter_consumer_key, { :class => 'span6'})%>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="twitter_consumer_secret"><%= _("Twitter consumer secret")%></label>
+    <label class='control-label' for="setting_twitter_consumer_secret"><%= _("Twitter consumer secret")%></label>
     <div class='controls'>
       <%= text_field(:setting, :twitter_consumer_secret, { :class => 'span6'})%>
     </div>
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index 6098f855b7..7d1dc41d6f 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -15,7 +15,7 @@
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="user_password"><%= _("Password confirmation")%></label>
+    <label class='control-label' for="user_password_confirmation"><%= _("Password confirmation")%></label>
     <div class='controls'>
       <%= password_field('user', 'password_confirmation', {:class => 'span5'})  %>
     </div>
@@ -67,9 +67,9 @@
   </div>
   <% unless @user.login.nil? %>
   <div class='control-group'>
-    <label class='control-label' for="user_login"><%= _("Display Name")%></label>
+    <label class='control-label' for="user_name"><%= _("Display Name")%></label>
     <div class='controls'>
-      <select name="user[name]">
+      <select name="user[name]" id="user_name">
         <%= options_for_select(@user.display_names, @user.name) %>
       </select>
     </div>
@@ -112,20 +112,20 @@
   <% disabled = (this_blog.has_twitter_configured?) ? false : true %>
   <%= twitter_disabled_message(disabled) %>
   <div class='control-group'>
-    <label class='control-label' for="twitter_account"><%= _("Twitter account")%></label>
+    <label class='control-label' for="user_twitter_account"><%= _("Twitter account")%></label>
     <div class='controls'>
       <%= text_field('user', 'twitter_account', {:class => 'span5', :disabled => disabled }) %>
       <p class='help-block'>The Twitter account you want to post with</p>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="twitter_oauth_token"><%= _("Twitter oauth token")%></label>
+    <label class='control-label' for="user_twitter_oauth_token"><%= _("Twitter oauth token")%></label>
     <div class='controls'>
       <%= text_field('user', 'twitter_oauth_token', {:class => 'span5', :disabled => disabled}) %>
     </div>
   </div>
   <div class='control-group'>
-    <label class='control-label' for="twitter_oauth_token_secret"><%= _("Twitter oauth secret")%></label>
+    <label class='control-label' for="user_twitter_oauth_token_secret"><%= _("Twitter oauth secret")%></label>
     <div class='controls'>
       <%= text_field('user', 'twitter_oauth_token_secret', {:class => 'span5', :disabled => disabled}) %>
     </div>