updated webkey behavior to be more user friendly