Feature/not me redirect

WIP

- Fixes redirect problem on "not me"
- Needs tests