#JC-1564 bugs fix, prefix to [user] tag