diff --git a/js/connection.js b/js/connection.js
index 28f2db8..30aea0f 100644
--- a/js/connection.js
+++ b/js/connection.js
@@ -15,6 +15,9 @@ function ConnectionController( $scope, rconService, $routeParams, $timeout )
 
 	$scope.Connect = function ()
 	{
+		$scope.Address = $scope.Address.trim();
+		$scope.Password = $scope.Password.trim();
+
 		$scope.LastErrorMessage = null;
 		rconService.Connect( $scope.Address, $scope.Password );
 	}