Security Changes

Alterations to fix bug fixes related to user security