Fix share folder with users feature that got broken during merge of v1.1 with master