Fixed authenticator to use get_or_insert.
Added todo for stephen.