diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Activities/RedirectActivity.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Activities/RedirectActivity.cs
index cbb963e02..63f60db3a 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Activities/RedirectActivity.cs
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Activities/RedirectActivity.cs
@@ -16,7 +16,8 @@ namespace Orchard.Workflows.Activities {
         public Localizer T { get; set; }
 
         public override bool CanExecute(WorkflowContext workflowContext, ActivityContext activityContext) {
-            return true;
+            var url = activityContext.GetState<string>("Url");
+            return !string.IsNullOrWhiteSpace(url);
         }
 
         public override IEnumerable<LocalizedString> GetPossibleOutcomes(WorkflowContext workflowContext, ActivityContext activityContext) {
@@ -38,7 +39,7 @@ namespace Orchard.Workflows.Activities {
         }
 
         public override LocalizedString Description {
-            get { return T("Redirect to the specified URL."); }
+            get { return T("Redirects to the specified URL."); }
         }
 
         public override string Form {
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Redirect.cshtml b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Redirect.cshtml
index cedaf8f5f..4b523fe3f 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Redirect.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Redirect.cshtml
@@ -1,4 +1,8 @@
 <div>
-    <div>@T("Redirect to {0}", Model.State.Url.Value)</div>
-</div>
-
+    @if (Model.State.Url != null && !String.IsNullOrWhiteSpace(Model.State.Url.Value)) {
+        <div>@T("Redirect to {0}", Model.State.Url.Value)</div>
+    }
+    else {
+        <div>@T("Redirect")</div>
+    }
+</div>
\ No newline at end of file