Check current name of user instead of blindly using user_text (could've been renamed since)

Change-Id: Ie4348744901f9fc63502c57e0fc34aa9d3c0758d