diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
index 104b09a8..bf4d3e5d 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
@@ -78,13 +78,19 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
 
 	@Override
 	public void start() {
-		if (port != 0) {
+        //only set the port if the nonSecurePort is 0 and this.port != 0
+		if (port != 0 && instanceConfig.getNonSecurePort() == 0) {
 			instanceConfig.setNonSecurePort(port);
+        }
+        //only initialize if nonSecurePort is greater than 0 and it isn't already running
+        //because of containerPortInitializer below
+        if (!running && instanceConfig.getNonSecurePort() > 0) {
             discoveryManagerIntitializer().init();
-			logger.info("Registering application {} with eureka with status UP",
-					instanceConfig.getAppname());
-			ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.UP);
-		}
+            logger.info("Registering application {} with eureka with status UP",
+                    instanceConfig.getAppname());
+            ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.UP);
+            running = true;
+        }
 	}
 
 	@Override
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
new file mode 100644
index 00000000..eba5afef
--- /dev/null
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.netflix.eureka;
+
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class EurekaInstanceConfigBeanTests {
+
+	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+
+	@After
+	public void init() {
+		if (context != null) {
+			context.close();
+		}
+	}
+
+	@Test
+	public void basicBinding() {
+		EnvironmentTestUtils.addEnvironment(context,
+				"eureka.instance.appGroupName=mygroup");
+		context.register(PropertyPlaceholderAutoConfiguration.class,
+				TestConfiguration.class);
+		context.refresh();
+		assertEquals("mygroup", context.getBean(EurekaInstanceConfigBean.class)
+				.getAppGroupName());
+	}
+
+	@Test
+	public void nonSecurePort() {
+        testNonSecurePort("eureka.instance.nonSecurePort");
+    }
+
+    @Test
+    public void nonSecurePort2() {
+        testNonSecurePort("server.port");
+    }
+
+    @Test
+    public void nonSecurePort3() {
+        testNonSecurePort("SERVER_PORT");
+    }
+
+    @Test
+    public void nonSecurePort4() {
+        testNonSecurePort("PORT");
+    }
+
+    private void testNonSecurePort(String propName) {
+        EnvironmentTestUtils.addEnvironment(context, propName +":8888");
+        context.register(PropertyPlaceholderAutoConfiguration.class,
+                TestConfiguration.class);
+        context.refresh();
+        assertEquals(8888,
+                context.getBean(EurekaInstanceConfigBean.class).getNonSecurePort());
+    }
+
+    /*
+        @Test
+        public void serviceUrlWithCompositePropertySource() {
+            CompositePropertySource source = new CompositePropertySource("composite");
+            context.getEnvironment().getPropertySources().addFirst(source);
+            source.addPropertySource(new MapPropertySource("config", Collections
+                    .<String, Object> singletonMap("eureka.client.serviceUrl.defaultZone",
+                            "http://example.com")));
+            context.register(PropertyPlaceholderAutoConfiguration.class,
+                    TestConfiguration.class);
+            context.refresh();
+            assertEquals("{defaultZone=http://example.com}",
+                    context.getBean(EurekaInstanceConfigBean.class).getServiceUrl().toString());
+            assertEquals(
+                    "[http://example.com]",
+                    context.getBean(EurekaInstanceConfigBean.class)
+                            .getEurekaServerServiceUrls("defaultZone").toString());
+        }
+
+        @Test
+        public void serviceUrlWithDefault() {
+            EnvironmentTestUtils.addEnvironment(context,
+                    "eureka.client.serviceUrl.defaultZone:",
+                    "eureka.client.serviceUrl.default:http://example.com");
+            context.register(PropertyPlaceholderAutoConfiguration.class,
+                    TestConfiguration.class);
+            context.refresh();
+            assertEquals(
+                    "[http://example.com]",
+                    context.getBean(EurekaInstanceConfigBean.class)
+                            .getEurekaServerServiceUrls("defaultZone").toString());
+        }
+    */
+	@Configuration
+	@EnableConfigurationProperties(EurekaInstanceConfigBean.class)
+	protected static class TestConfiguration {
+
+	}
+
+}