More login and encryption work