sorted out username_map bug