diff --git a/hazelcast/include/hazelcast/client/ClientConfig.h b/hazelcast/include/hazelcast/client/ClientConfig.h
index f966d5a94e..f1d2d103a7 100644
--- a/hazelcast/include/hazelcast/client/ClientConfig.h
+++ b/hazelcast/include/hazelcast/client/ClientConfig.h
@@ -427,8 +427,6 @@ namespace hazelcast {
 
             Credentials *credentials;
 
-            std::auto_ptr<Credentials> defaultCredentials;
-
             std::map<std::string, config::ReliableTopicConfig> reliableTopicConfigMap;
 
             util::SynchronizedMap<std::string, config::NearCacheConfigBase> nearCacheConfigMap;
diff --git a/hazelcast/src/hazelcast/client/ClientConfig.cpp b/hazelcast/src/hazelcast/client/ClientConfig.cpp
index 34c9764fb1..0ff5ba4a4b 100644
--- a/hazelcast/src/hazelcast/client/ClientConfig.cpp
+++ b/hazelcast/src/hazelcast/client/ClientConfig.cpp
@@ -30,8 +30,7 @@ namespace hazelcast {
         , connectionAttemptLimit(2)
         , attemptPeriod(3000)
         , socketInterceptor(NULL)
-        , credentials(NULL)
-        , defaultCredentials(NULL){
+        , credentials(NULL) {
         }
 
         ClientConfig& ClientConfig::addAddress(const Address& address) {
@@ -146,7 +145,7 @@ namespace hazelcast {
         }
 
         const Credentials *ClientConfig::getCredentials() {
-            return defaultCredentials.get();
+            return credentials;
         }
 
         ClientConfig& ClientConfig::setSocketInterceptor(SocketInterceptor *socketInterceptor) {