Fix for https://github.com/TeamMentor/Master/issues/828

Adding Michael files from PR: https://github.com/TeamMentor/Dev/pull/151/files