Fix share with displayname

Finally fixes #2237 

Review please @MTGap @schiesbn or others