During install user is not switched to secondary user account

During the install the user is not switched to the non uid=1 account.

This is because the new user is failing to load since it has a hardcoded uid = 2, on a fresh install this is getting uid = 4 for some reason.

Fix the hardcoded value to be derived automatically.