Added timeout for logins to match expire_in of tokens Fixed resetting of app_id when resetting config to defaults