In D14370#399328, @kamil wrote:

Looks good but works only partially, as per the previous diff there are places where a username or user identifier is used, should we also add ashoat string here?

Yes, that should be okay, cc @ashoat