fixed loginview

some stuff left over from merge conflict