Changes for Fix_1 - Credentials "Replace" function was not working