Updated local users table

And location of the declaration for the users email, closer where it is
used.