Fixed up sign in page and some None handling for login