moved data stuff to login form