Fix/1005

- [ ] Ready to merge
- [ ] Confirm no db calls will be affected adversly
- [ ] Test logging in/out saving bins etc...

Closes #1005