diff --git a/src/main/java/com/openshift/client/configuration/AbstractOpenshiftConfiguration.java b/src/main/java/com/openshift/client/configuration/AbstractOpenshiftConfiguration.java
index bd0fe743..8620d6e7 100755
--- a/src/main/java/com/openshift/client/configuration/AbstractOpenshiftConfiguration.java
+++ b/src/main/java/com/openshift/client/configuration/AbstractOpenshiftConfiguration.java
@@ -166,7 +166,7 @@ protected String removeQuotes(String value) {
 	}
 	
 	public String getPassword() {
-		return properties.getProperty(KEY_PASSWORD);
+		return removeQuotes(properties.getProperty(KEY_PASSWORD));
 	}
 
 	public String getClientId() {
diff --git a/src/test/java/com/openshift/internal/client/ConfigurationTest.java b/src/test/java/com/openshift/internal/client/ConfigurationTest.java
index 7f0e799a..27f8ee88 100644
--- a/src/test/java/com/openshift/internal/client/ConfigurationTest.java
+++ b/src/test/java/com/openshift/internal/client/ConfigurationTest.java
@@ -258,4 +258,28 @@ public void fallsBackToDefaultUrl() throws OpenShiftException, IOException {
 		assertTrue(configuration.getLibraServer().contains(DefaultConfiguration.LIBRA_SERVER));
 		assertNull(configuration.getRhlogin());
 	}
+
+	@Test
+	public void canReadPassword() throws OpenShiftException, IOException {
+		UserConfigurationFake userConfiguration = new UserConfigurationFake() {
+
+			protected void initFile(Writer writer) throws IOException {
+				writer.append(KEY_PASSWORD).append('=').append("somePassword").append('\n');
+			}
+
+		};
+		assertEquals("somePassword", userConfiguration.getPassword());
+	}
+
+	@Test
+	public void canStripQuotesOfPassword() throws OpenShiftException, IOException {
+		UserConfigurationFake userConfiguration = new UserConfigurationFake() {
+
+			protected void initFile(Writer writer) throws IOException {
+				writer.append(KEY_PASSWORD).append('=').append("'somePassword'").append('\n');
+			}
+
+		};
+		assertEquals("somePassword", userConfiguration.getPassword());
+	}
 }