diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java
index 4d618f95..4facede6 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java
@@ -135,6 +135,7 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig {
 	 * secure virtual host name.Think of this as similar to the fully qualified domain
 	 * name, that the users of your services will need to find this instance.
 	 */
+	@Value("${spring.application.name:unknown}")
 	private String secureVirtualHostName;
 
 	/**
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
index c8e88c8d..57ff1067 100644
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
+++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
@@ -176,6 +176,15 @@ public class EurekaInstanceConfigBeanTests {
 
 	}
 
+	@Test
+	public void testVirtualHostName() throws Exception {
+		addEnvironment(this.context, "spring.application.name:myapp");
+		setupContext();
+		assertEquals("virtualHostName wrong", "myapp", getInstanceConfig().getVirtualHostName());
+		assertEquals("secureVirtualHostName wrong", "myapp", getInstanceConfig().getSecureVirtualHostName());
+
+	}
+
 	private void setupContext() {
 		this.context.register(PropertyPlaceholderAutoConfiguration.class,
 				TestConfiguration.class);