fix missing button callback after login attempt + some other errors
Merge branch 'DA-419' into unstable

* DA-419:
  fix missing button callback after login attempt + some other errors