diff --git a/system_setup/client/controllers/identity.py b/system_setup/client/controllers/identity.py
index 0680792a..d05c5065 100644
--- a/system_setup/client/controllers/identity.py
+++ b/system_setup/client/controllers/identity.py
@@ -36,3 +36,15 @@ class WSLIdentityController(IdentityController):
                 username=self.answers['username'],
                 crypted_password=self.answers['password'])
             self.done(identity)
+
+    def done(self, identity_data):
+        log.debug(
+            "IdentityController.done next_screen user_spec=%s",
+            identity_data)
+        if self.opts.dry_run:
+            username = "dryrun_user"
+        else:
+            username = identity_data.username
+        with open('/var/run/ubuntu_wsl_oobe_assigned_account', 'w') as f:
+            f.write(username)
+        self.app.next_screen(self.endpoint.POST(identity_data))
diff --git a/system_setup/ui/views/overview.py b/system_setup/ui/views/overview.py
index 43a34f2d..1234e661 100644
--- a/system_setup/ui/views/overview.py
+++ b/system_setup/ui/views/overview.py
@@ -5,7 +5,7 @@ Overview provides user with the overview of all the current settings.
 """
 
 
-
+import os
 import logging
 
 from subiquitycore.ui.buttons import done_btn
@@ -20,9 +20,10 @@ class OverviewView(BaseView):
 
     def __init__(self, controller):
         self.controller = controller
-        user_name = "test"
-        #with open('/var/lib/ubuntu-wsl/assigned_account', 'r') as f:
-        #    user_name = f.read()
+        user_name = ""
+        with open('/var/run/ubuntu_wsl_oobe_assigned_account', 'r') as f:
+            user_name = f.read()
+        os.remove('/var/run/ubuntu_wsl_oobe_assigned_account')
         complete_text = _("Hi {username},\n"
                           "You have complete the setup!\n\n"
                           "It is suggested to run the following command to update your Ubuntu "