Change User key + fix bug