Login form mostly integrated now