Set current user info as authenticated by rm token

Minor moving around of defs