Improved auto connect massage #4237