Feature/69 enforce login