login button hook
merge fix