MKL-335 Userdirectory Issue