diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 76c69a3..7c2bc3c 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -19,11 +19,13 @@ package com.cyanogenmod.setupwizard.ui;
 import android.animation.Animator;
 import android.app.Activity;
 import android.app.AppGlobals;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.view.MotionEvent;
 import android.view.View;
@@ -107,6 +109,10 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
         } catch (Settings.SettingNotFoundException e) {
             // Continue with setup
         }
+        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (userManager.isGuestUser()) {
+            finishSetup();
+        }
         registerReceiver(mSetupData, mSetupData.getIntentFilter());
     }