Updated to use password instead if IP check