Added system settings option (issue #1776)