diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java
index eb7707adf..2f3100918 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java
@@ -264,7 +264,7 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
             final String compClassName = componentClass.getName();
 
             if (panel != null) {
-                panel.setNextStepKey(step.getClass().getName());
+                panel.setNextStepKey(key);
             }
             panel = new StepComponent(compClassName);
             stepsContainer.add(panel);