Record current user instead of an old one.

fix #526
Merge branch '1.1.x'