diff --git a/src/main/java/jenkins/plugins/http_request/HttpRequest.java b/src/main/java/jenkins/plugins/http_request/HttpRequest.java
index d0709865..41627963 100644
--- a/src/main/java/jenkins/plugins/http_request/HttpRequest.java
+++ b/src/main/java/jenkins/plugins/http_request/HttpRequest.java
@@ -332,8 +332,7 @@ List<HttpRequestNameValuePair> resolveHeaders(EnvVars envVars) {
 		for (HttpRequestNameValuePair header : customHeaders) {
 			String headerName = envVars.expand(header.getName());
 			String headerValue = envVars.expand(header.getValue());
-			boolean maskValue = headerName.equalsIgnoreCase(HttpHeaders.AUTHORIZATION) ||
-					header.getMaskValue();
+			boolean maskValue = header.getMaskValue();
 
 			headers.add(new HttpRequestNameValuePair(headerName, headerValue, maskValue));
 		}
diff --git a/src/main/java/jenkins/plugins/http_request/HttpRequestStep.java b/src/main/java/jenkins/plugins/http_request/HttpRequestStep.java
index 2c7430a2..b161c313 100644
--- a/src/main/java/jenkins/plugins/http_request/HttpRequestStep.java
+++ b/src/main/java/jenkins/plugins/http_request/HttpRequestStep.java
@@ -253,8 +253,7 @@ List<HttpRequestNameValuePair> resolveHeaders() {
 		for (HttpRequestNameValuePair header : customHeaders) {
 			String headerName = header.getName();
 			String headerValue = header.getValue();
-			boolean maskValue = headerName.equalsIgnoreCase(HttpHeaders.AUTHORIZATION) ||
-					header.getMaskValue();
+			boolean maskValue = header.getMaskValue();
 
 			headers.add(new HttpRequestNameValuePair(headerName, headerValue, maskValue));
 		}
diff --git a/src/main/java/jenkins/plugins/http_request/util/HttpRequestNameValuePair.java b/src/main/java/jenkins/plugins/http_request/util/HttpRequestNameValuePair.java
index 37f627d8..ae0cd1a0 100644
--- a/src/main/java/jenkins/plugins/http_request/util/HttpRequestNameValuePair.java
+++ b/src/main/java/jenkins/plugins/http_request/util/HttpRequestNameValuePair.java
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 
 import org.apache.http.NameValuePair;
+import org.apache.http.HttpHeaders;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
@@ -30,7 +31,11 @@ public HttpRequestNameValuePair(String name, String value, boolean maskValue) {
     }
 
     public HttpRequestNameValuePair(String name, String value) {
-        this(name, value, false);
+        if (name.equalsIgnoreCase(HttpHeaders.AUTHORIZATION)) {
+            this(name, value, true);
+        } else {
+            this(name, value, false);
+        }
     }
 
     public String getName() {