diff --git a/app/controllers/dmsf_state_controller.rb b/app/controllers/dmsf_state_controller.rb
index e831d0a8..434df33f 100644
--- a/app/controllers/dmsf_state_controller.rb
+++ b/app/controllers/dmsf_state_controller.rb
@@ -49,11 +49,14 @@ class DmsfStateController < ApplicationController
   end
 
   def user_pref
+  end
+
+  def user_pref_save
     @user_pref = DmsfUserPref.for(@project, User.current)
     @user_pref.email_notify = params[:email_notify];
     @user_pref.save
     flash[:notice] = l(:notice_your_preferences_were_saved)
-    redirect_to URI.unescape(params[:current])
+    redirect_to :action => "user_pref", :id => @project
   end
 
   def folder_notify_activate
diff --git a/app/views/dmsf/index.html.erb b/app/views/dmsf/index.html.erb
index 76e7541f..75824374 100644
--- a/app/views/dmsf/index.html.erb
+++ b/app/views/dmsf/index.html.erb
@@ -1,4 +1,4 @@
-<% html_title("DMSF") %>
+<% html_title(l(:dmsf)) %>
 
 <div class="contextual">
 	<% if User.current.allowed_to?(:folder_manipulation, @project) %>
@@ -162,7 +162,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 <%= render(:partial => "multi_upload") %>
 <br />
 
-<%= render(:partial => "user_pref") %>
+<%= link_to(l(:link_user_preferences), {:controller => "dmsf_state", :action => "user_pref", :id => @project}) %>
 
 <% content_for :header_tags do %>
 	<script type="text/javascript">
diff --git a/app/views/dmsf/_user_pref.html.erb b/app/views/dmsf_state/user_pref.html.erb
similarity index 60%
rename from app/views/dmsf/_user_pref.html.erb
rename to app/views/dmsf_state/user_pref.html.erb
index 1dd70be3..d28b0fce 100644
--- a/app/views/dmsf/_user_pref.html.erb
+++ b/app/views/dmsf_state/user_pref.html.erb
@@ -1,7 +1,13 @@
+<% html_title(l(:dmsf)) %>
+
+<div class="contextual">
+</div>
+
+<h2><%= l(:link_user_preferences) %></h2>
+
 <div class="box">
-	<% form_tag({:controller => "dmsf_state", :action => "user_pref", :id => @project, :current => URI.escape(request.url)},
+	<% form_tag({:controller => "dmsf_state", :action => "user_pref_save", :id => @project},
 		:method=>:post) do %>
-	<h3>Your <%= l(:dmsf) %> preferences for project</h3>
 	<div>
 		Notifications: 
 		<%= select_tag("email_notify", 
@@ -10,4 +16,8 @@
 		<%= submit_tag("Save", :title => "Save preferences") %>
 	</div>
 	<% end %>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for :header_tags do %>
+	<%= stylesheet_link_tag "dmsf", :plugin => "redmine_dmsf" %>
+<% end %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ab21073b..6ae402f3 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -49,7 +49,6 @@ cs:
   :title_notifications_active_deactivate: "Notifications active: Deactivate"
   :title_notifications_not_active_activate: "Notifications not active: Activate"
   :title_title_version_version_download: "%{title} version %{version} download"
-  
   :title_locked_by_user: "Locked by %{user}"
   :title_locked_by_you: "Locked by you"
   :title_waiting_for_approval: "Waiting for Approval"
@@ -60,3 +59,6 @@ cs:
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
   :title_send_checked_by_email: "Send checked by email"
+
+  :link_user_preferences: "Your DMSF project preferences"
+  
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 22980c79..105c83c1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -59,4 +59,5 @@ de:
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
   :title_send_checked_by_email: "Send checked by email"
+  :link_user_preferences: "Your DMSF project preferences"
   
\ No newline at end of file
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 4c04a595..101ecd27 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -59,4 +59,5 @@ en-GB:
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
   :title_send_checked_by_email: "Send checked by email"
+  :link_user_preferences: "Your DMSF project preferences"
   
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 582da0a0..40668e63 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -58,4 +58,5 @@ en:
   :submit_download: "Download"
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
-  :title_send_checked_by_email: "Send checked by email"
\ No newline at end of file
+  :title_send_checked_by_email: "Send checked by email"
+  :link_user_preferences: "Your DMSF project preferences"
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d3434e77..755f3630 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -59,4 +59,5 @@ es:
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
   :title_send_checked_by_email: "Send checked by email"
+  :link_user_preferences: "Your DMSF project preferences"
   
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1f9fc2d5..1d5d3b0c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -59,4 +59,5 @@ fr:
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
   :title_send_checked_by_email: "Send checked by email"
+  :link_user_preferences: "Your DMSF project preferences"
   
\ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 98f6e166..5b4532c7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -59,4 +59,5 @@ ru:
   :title_download_checked: "Download checked in Zip archive"
   :submit_email: "Email"
   :title_send_checked_by_email: "Send checked by email"
+  :link_user_preferences: "Your DMSF project preferences"
   
\ No newline at end of file
diff --git a/init.rb b/init.rb
index 566cc713..af700d3f 100644
--- a/init.rb
+++ b/init.rb
@@ -43,7 +43,7 @@ Redmine::Plugin.register :redmine_dmsf do
   
   project_module :dmsf do
     permission :browse_documents, {:dmsf => [:index]}
-    permission :user_preferences, {:dmsf_state => [:user_pref]}
+    permission :user_preferences, {:dmsf_state => [:user_pref, :user_pref_save]}
     permission :view_dmsf_files, {:dmsf => [:download_file, :download_revision, :entries_operation, :email_entries_send],
       :dmsf_detail => [:file_detail]}
     permission :folder_manipulation, {:dmsf_detail => [:create_folder, :delete_folder, :folder_detail, :save_folder]}