- Added fix to stop the user having to click on the button twice to sear...

...ch.

- Updated so the use of --login, --deactivate and --edit can be used