diff --git a/lib/capistrano/tasks/github.rake b/lib/capistrano/tasks/github.rake
index 43ae4f5..3914619 100644
--- a/lib/capistrano/tasks/github.rake
+++ b/lib/capistrano/tasks/github.rake
@@ -36,7 +36,7 @@ namespace :github do
   namespace :deployment do
     desc 'Create new deployment'
     task :create do
-      next if fetch(:github_deployment_skip)
+      next if fetch(:github_deployment_skip) || fetch(:current_github_deployment)
 
       gh = fetch(:github_deployment_api)
       payload = fetch(:github_deployment_payload)
@@ -70,7 +70,7 @@ namespace :github do
     end
   end
 
-  print_deployment = -> d { puts "Deployment (#{d.last_state}): #{d.created_at} #{d.ref}@#{d.sha} to #{d.environment} by @#{d.creator_login}" }
+  print_deployment = -> d { puts "Deployment##{d.id} (#{d.last_state}): #{d.created_at} #{d.ref}@#{d.sha} to #{d.environment} by @#{d.creator_login}" }
   print_status = -> s { puts "\t#{s.created_at} state: #{s.state}" }
 
   desc 'List Github deployments'