Fix bug 1036127: Show service on profile view page
Merge pull request #2677 from openjck/1036127-profile-view-icon

Fix bug 1036127: Show service on profile view page
fix bug 1055565 - Don't show login on 404 page when the user is logged in