More Service Wraps, Update For First Time Login