eSourcing Id was not repopulating when cookie was refreshed 

Refactored to avoid future problems