General cleanup and revision of sign on message implementation.