Fix for Login bug due to NSNotFound fix