diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index f2e04f05e..fdbb966d1 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -409,7 +409,10 @@ static PhoneMainView* phoneMainViewInstance=nil;
         if(list != NULL) {
             [self changeCurrentView: [DialerViewController compositeViewDescription]];
         } else {
-            [self changeCurrentView: [WizardViewController compositeViewDescription]];
+            WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
+            if(controller != nil) {
+                [controller reset];
+            }
         }
     }
     
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index 8143f129a..ec63fea7e 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -564,7 +564,10 @@ static UICompositeViewDescription *compositeDescription = nil;
     if([key isEqual:@"console_button"]) {
         [[PhoneMainView instance] changeCurrentView:[ConsoleViewController compositeViewDescription] push:TRUE];
     } else if([key isEqual:@"wizard_button"]) {
-        [[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]];
+        WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
+        if(controller != nil) {
+            [controller reset];
+        }
     }
 }
 @end
diff --git a/Classes/WizardViewController.h b/Classes/WizardViewController.h
index f0e8f2b99..6140edc44 100644
--- a/Classes/WizardViewController.h
+++ b/Classes/WizardViewController.h
@@ -42,6 +42,8 @@
 @property (nonatomic, retain) IBOutlet UIButton *backButton;
 @property (nonatomic, retain) IBOutlet UIButton *startButton;
 
+- (void)reset;
+
 - (IBAction)onStartClick:(id)sender;
 - (IBAction)onBackClick:(id)sender;
 - (IBAction)onCancelClick:(id)sender;
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index c99fba0b5..ba97c98a1 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -109,12 +109,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark - ViewController Functions
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self resetWizard];
-}
-
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
@@ -161,7 +155,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     }
 }
 
-- (void)resetWizard {
+- (void)reset {
     [self clearProxyConfig];
     [WizardViewController cleanTextField:welcomeView];
     [WizardViewController cleanTextField:choiceView];