Adding identity override on client