S2 Cf10 Incorporates CR changes-
Fixes hash format, handles user not found exception.
https://vinsol.atlassian.net/browse/CF-10