Corrected logic for local users
Made some background changes to the app again