correct login - needs much cleanup /zeus