Fixes #1072. Again. :(
Merge branch 'feature/issue1072' into develop

Conflicts:
	website/static/js/profile.js