rebase fixing plus proper theming of legacy login fields

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>