Changed security to MAC based - without user prompt