Fix; User Key generation