CHOP-79 Fixing volatile key pair issue in webapp