diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
index bac20fea..a09858d1 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
@@ -58,11 +58,16 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter;
 @AutoConfigureAfter(EndpointAutoConfiguration.class)
 public class RefreshEndpointAutoConfiguration {
 
-	@ConditionalOnBean(EndpointAutoConfiguration.class)
+	//TODO Remove this class and InfoEndpointRebinderConfiguration once we no longer
+	//need to support Boot 1.3.x
 	@ConditionalOnMissingClass("org.springframework.boot.actuate.info.InfoContributor")
-	@Bean
-	InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
-		return new InfoEndpointRebinderConfiguration();
+	protected static class InfoEndpointAutoConfiguration {
+
+		@ConditionalOnBean(EndpointAutoConfiguration.class)
+		@Bean
+		InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
+			return new InfoEndpointRebinderConfiguration();
+		}
 	}
 
 	@ConditionalOnMissingBean
@@ -168,7 +173,7 @@ public class RefreshEndpointAutoConfiguration {
 		}
 
 		private InfoEndpoint infoEndpoint(InfoEndpoint endpoint) {
-			return new InfoEndpoint(endpoint.invoke()) {
+			InfoEndpoint newEndpoint = new InfoEndpoint(endpoint.invoke()) {
 				@Override
 				public Map<String, Object> invoke() {
 					Map<String, Object> info = new LinkedHashMap<String, Object>(
@@ -177,6 +182,10 @@ public class RefreshEndpointAutoConfiguration {
 					return info;
 				}
 			};
+			newEndpoint.setId(endpoint.getId());
+			newEndpoint.setEnabled(endpoint.isEnabled());
+			newEndpoint.setSensitive(endpoint.isSensitive());
+			return newEndpoint;
 		}
 
 	}