Fixed user keys issue