Reverted checklogin to f46220bc49d1fa63b12dc863afd36086b7e37b7d