diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolver.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolver.java
index c7b4f2f8..00dd08ab 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolver.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolver.java
@@ -55,7 +55,7 @@ public class SimpleTaskNameResolver implements TaskNameResolver, ApplicationCont
 			return configuredName;
 		}
 		else {
-			return context.getId();
+			return context.getId().replace(":", "_");
 		}
 	}
 }
diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolverTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolverTests.java
index cf01adfa..25e9b6df 100644
--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolverTests.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskNameResolverTests.java
@@ -15,13 +15,13 @@
  */
 package org.springframework.cloud.task.repository.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
 import org.springframework.context.support.GenericApplicationContext;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author Michael Minella
  */
@@ -37,6 +37,17 @@ public class SimpleTaskNameResolverTests {
 		assertTrue(taskNameResolver.getTaskName().startsWith("org.springframework.context.support.GenericApplicationContext"));
 	}
 
+	@Test
+	public void testWithProfile() {
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.setId("foo:bar");
+
+		SimpleTaskNameResolver taskNameResolver = new SimpleTaskNameResolver();
+		taskNameResolver.setApplicationContext(context);
+
+		assertTrue(taskNameResolver.getTaskName().startsWith("foo_bar"));
+	}
+
 	@Test
 	public void testApplicationName() {
 		GenericApplicationContext context = new GenericApplicationContext();