Modified Encryption methods to not trigger salt error