Added restrictions against wrong user