Made account setup better