BAC-527: non-static => static methods + fix UserRenameTool - there is array with expire = null, so "null" value should be checked