prevented blank user details displaying icons
Merge branch 'development'