Refactor Finish
Post mod_login Changes