Merge pull request #1898 from christav/using-sm-client-websites

Using sm client websites