Revamped server-side storage of client keys