diff --git a/bin/fog b/bin/fog
index 104e07c66..ac150d5e7 100755
--- a/bin/fog
+++ b/bin/fog
@@ -5,20 +5,8 @@ require 'yaml'
 
 module Fog
   module Credentials
-    key = (ARGV.first && :"#{ARGV.first}") || :default
-    unless Fog.credentials(key)
-      print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
-      yml = <<-YML
-
-:#{key}:
-  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_username: INTENTIONALLY_LEFT_BLANK
-  :slicehost_password: INTENTIONALLY_LEFT_BLANK
-
-YML
-      print(yml)
+    credential = (ARGV.first && :"#{ARGV.first}") || :default
+    unless Fog.credentials[credential]
       exit
     end
   end
@@ -26,15 +14,13 @@ end
 
 module AWS
   class << self
-    key = (ARGV.first && :"#{ARGV.first}") || :default
-    if Fog.credentials(key)[:aws_access_key_id] && Fog.credentials(key)[:aws_secret_access_key]
+    credential = (ARGV.first && :"#{ARGV.first}") || :default
+    if Fog.credentials[credential][:aws_access_key_id] && Fog.credentials[credential][:aws_secret_access_key]
 
       def connections
         @@connections ||= Hash.new do |hash, key|
-          credentials = {
-            :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-            :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-          }
+          credential = (ARGV.first && :"#{ARGV.first}") || :default
+          credentials = Fog.credentials[credential]
           hash[key] = case key
           when :ec2
             Fog::AWS::EC2.new(credentials)
@@ -86,15 +72,13 @@ end
 
 module Rackspace
   class << self
-    key = (ARGV.first && :"#{ARGV.first}") || :default
-    if Fog.credentials(key)[:rackspace_api_key] && Fog.credentials(key)[:rackspace_username]
+    credential = (ARGV.first && :"#{ARGV.first}") || :default
+    if Fog.credentials[credential][:rackspace_api_key] && Fog.credentials[credential][:rackspace_username]
 
       def connections
         @@connections ||= Hash.new do |hash, key|
-          credentials = {
-            :rackspace_api_key => Fog.credentials[:rackspace_api_key],
-            :rackspace_username => Fog.credentials[:rackspace_username]
-          }
+          credential = (ARGV.first && :"#{ARGV.first}") || :default
+          credentials = Fog.credentials[credential]
           hash[key] = case key
           when :files
             Fog::Rackspace::Files.new(credentials)
diff --git a/lib/fog.rb b/lib/fog.rb
index e8de91de7..5b72063c8 100644
--- a/lib/fog.rb
+++ b/lib/fog.rb
@@ -38,16 +38,31 @@ module Fog
     load "fog/slicehost.rb"
   end
 
-  def self.credentials(key = :default)
+  def self.credentials
     @credentials ||= begin
       path = File.expand_path('~/.fog')
-      if File.exists?(path)
+      credentials = if File.exists?(path)
         File.open(path) do |file|
-          YAML.load(file.read)[key]
+          YAML.load(file.read)
         end
       else
         nil
       end
+      unless credentials
+        print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
+        yml = <<-YML
+
+:#{key}:
+  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_username: INTENTIONALLY_LEFT_BLANK
+  :slicehost_password: INTENTIONALLY_LEFT_BLANK
+
+YML
+        print(yml)
+      end
+      credentials
     end
   end