diff --git a/lib/omniauth/strategies/salesforce.rb b/lib/omniauth/strategies/salesforce.rb
index 452d5d8..1668d72 100755
--- a/lib/omniauth/strategies/salesforce.rb
+++ b/lib/omniauth/strategies/salesforce.rb
@@ -34,7 +34,7 @@ def request_phase
 
       def auth_hash
         signed_value = access_token.params['id'] + access_token.params['issued_at']
-        raw_expected_signature = OpenSSL::HMAC.digest('sha256', options.client_secret, signed_value)
+        raw_expected_signature = OpenSSL::HMAC.digest('sha256', options.client_secret.to_s, signed_value)
         expected_signature = Base64.strict_encode64 raw_expected_signature
         signature = access_token.params['signature']
         fail! "Salesforce user id did not match signature!" unless signature == expected_signature
@@ -79,7 +79,7 @@ def raw_info
           'issued_at' => access_token.params['issued_at']
         })
       end
-      
+
     end
 
     class SalesforceSandbox < OmniAuth::Strategies::Salesforce
diff --git a/spec/omniauth/strategies/salesforce_spec.rb b/spec/omniauth/strategies/salesforce_spec.rb
index ea0b367..c3e32fd 100755
--- a/spec/omniauth/strategies/salesforce_spec.rb
+++ b/spec/omniauth/strategies/salesforce_spec.rb
@@ -17,9 +17,9 @@
 				'REQUEST_METHOD' => 'GET',
 				'rack.input' => '',
 				'rack.url_scheme' => 'http',
-				'SERVER_NAME' => 'server.example', 
-				'QUERY_STRING' => 'code=xxxx', 
-				'SCRIPT_NAME' => '', 
+				'SERVER_NAME' => 'server.example',
+				'QUERY_STRING' => 'code=xxxx',
+				'SCRIPT_NAME' => '',
 				'SERVER_PORT' => 80
 			}
 		end
@@ -107,7 +107,7 @@
 			it "returns an info hash" do
 				subject.should_not be_nil
 			end
-			it "sets name" do 
+			it "sets name" do
 				subject['name'].should == raw_info['display_name']
 			end
 			it "sets email" do
@@ -140,7 +140,7 @@
 		end
 		describe "credentials" do
 			subject { strategy.credentials }
-			it "sets token" do 
+			it "sets token" do
 				subject['token'].should == strategy.access_token.token
 			end
 			it "sets instance_url" do
@@ -180,7 +180,7 @@
 			before do
 					client_id = "https://login.salesforce.com/id/00Dd0000000d45TEBQ/005d0000000fyGPCCY"
 					issued_at = "1331142541514"
-					signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', strategy.options.client_secret, client_id + issued_at))
+					signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', strategy.options.client_secret.to_s, client_id + issued_at))
 			end
 			context "when the signature does not match" do
 				before do