move username/password out of widget