enhance messages and warning for login and storage.