Finished the user checks (for now)

Signed-off-by: David Smith <david.smith@wirewool.com>