diff --git a/newwizardwidget.cpp b/newwizardwidget.cpp
index 37c68c553e8e0da908f22a6262c27ae252b26a5f..e1c74dd157ccad2dc3e5a9b29f1df77674d0ce16 100644
--- a/newwizardwidget.cpp
+++ b/newwizardwidget.cpp
@@ -260,10 +260,8 @@ void
 NewWizardWidget::on_nextButton_clicked()
 {
     const QWidget* curWidget = ui->stackedWidget->currentWidget();
-    if (curWidget != ui->createRingAccountPage) {
-        ui->setAvatarWidget->stopBooth();
-        disconnect(registeredNameFoundConnection_);
-    }
+    ui->setAvatarWidget->stopBooth();
+    disconnect(registeredNameFoundConnection_);
     if (curWidget == ui->createRingAccountPage ||
         curWidget == ui->linkRingAccountPage) {
         processWizardInformations();
@@ -274,12 +272,10 @@ void
 NewWizardWidget::on_previousButton_clicked()
 {
     const QWidget* curWidget = ui->stackedWidget->currentWidget();
-    if (curWidget != ui->createRingAccountPage) {
-        ui->setAvatarWidget->stopBooth();
-        disconnect(registeredNameFoundConnection_);
-        lookupStatusLabel_->hide();
-        passwordStatusLabel_->hide();
-    }
+    ui->setAvatarWidget->stopBooth();
+    disconnect(registeredNameFoundConnection_);
+    lookupStatusLabel_->hide();
+    passwordStatusLabel_->hide();
     if (curWidget == ui->createRingAccountPage ||
         curWidget == ui->linkRingAccountPage) {
         changePage(ui->welcomePage);