diff --git a/app/views/dmsf_links/_form.html.erb b/app/views/dmsf_links/_form.html.erb
index ba263c6d..82116078 100644
--- a/app/views/dmsf_links/_form.html.erb
+++ b/app/views/dmsf_links/_form.html.erb
@@ -63,7 +63,7 @@
           <%= label_tag('dmsf_link[target_folder_id]', l(:label_source_folder)) %>
         <% else %>
           <label for="dmsf_link_target_folder_id">
-            <%= "#{l(:label_target_folder)} #" %>
+            <%= l(:label_target_folder) %> <%= ' #' if @fast_links %>
             <span class="required">*</span>
           </label>
           <% if @fast_links %>
diff --git a/test/functional/dmsf_links_controller_test.rb b/test/functional/dmsf_links_controller_test.rb
index b26fb565..bec88392 100644
--- a/test/functional/dmsf_links_controller_test.rb
+++ b/test/functional/dmsf_links_controller_test.rb
@@ -21,6 +21,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class DmsfLinksControllerTest < RedmineDmsf::Test::TestCase
+  include Redmine::I18n
 
   fixtures :users, :email_addresses, :projects, :members, :dmsf_files, 
     :dmsf_file_revisions, :dmsf_folders, :dmsf_links, :roles, :member_roles
@@ -110,8 +111,18 @@ class DmsfLinksControllerTest < RedmineDmsf::Test::TestCase
   end
   
   def test_new    
-    get :new, :project_id => @project1.id
+    get :new, :project_id => @project1.id, :type => 'link_to'
     assert_response :success
+    assert_select 'label', { :text => l(:label_target_project) }
+  end
+
+  def test_new_fast_links_enabled
+    member = Member.where(:user_id => @user_member.id, :project_id =>  @project1.id).first
+    assert member
+    member.update_attribute :dmsf_fast_links, true
+    get :new, :project_id => @project1.id, :type => 'link_to'
+    assert_response :success
+    assert_select 'label', { :count => 0, :text => l(:label_target_project) }
   end
   
   def test_create_file_link_from_f1
diff --git a/test/integration/rest_api/dmsf_folder_api_test.rb b/test/integration/rest_api/dmsf_folder_api_test.rb
index 24a691c3..82701c6a 100644
--- a/test/integration/rest_api/dmsf_folder_api_test.rb
+++ b/test/integration/rest_api/dmsf_folder_api_test.rb
@@ -123,7 +123,6 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     #     <dmsf_links total_count="0" type="array">
     #     </dmsf_links>
     # </dmsf>
-    puts @response.body
     assert_select 'dmsf > dmsf_folders', :count => 1
     assert_select 'dmsf > dmsf_folders > folder > id', :text => @folder7.id.to_s
     assert_select 'dmsf > dmsf_folders > folder > title', :text => @folder7.title.to_s