diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index ea375e9ac..5bec55933 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -23,6 +23,6 @@
           = service.nickname
         = link_to "disconnect", service, :confirm => "disconnect #{service.provider}?", :method => :delete
 
-  %h4= link_to "Connect to twitter", "/auth/twitter"
-  %h4= link_to "Connect to facebook", "/auth/facebook"
+  %h4= link_to "Connect to twitter", "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
+  %h4= link_to "Connect to facebook", "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
 
diff --git a/config/deploy.rb b/config/deploy.rb
index b4893ec93..91fab2f85 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -56,9 +56,9 @@ namespace :deploy do
     run "ln -s -f #{shared_path}/app_config.yml #{current_path}/config/app_config.yml"
   end
 
-  task :symlink_fb_config do
-    run "touch #{shared_path}/fb_config.yml"
-    run "ln -s -f #{shared_path}/fb_config.yml #{current_path}/config/fb_config.yml"
+  task :symlink_oauth_keys_config do
+    run "touch #{shared_path}/oauth_keys.yml"
+    run "ln -s -f #{shared_path}/oauth_keys.yml #{current_path}/config/oauth_keys.yml"
   end
 
    task :start do