diff --git a/src/Sqlsrv/SqlsrvDriver.php b/src/Sqlsrv/SqlsrvDriver.php
index 772ec827..8e08016e 100644
--- a/src/Sqlsrv/SqlsrvDriver.php
+++ b/src/Sqlsrv/SqlsrvDriver.php
@@ -82,12 +82,12 @@ public static function isSupported()
 	public function __construct(array $options)
 	{
 		// Get some basic values from the options.
-		$options['host']     = $options['host'] ?? 'localhost';
-		$options['user']     = $options['user'] ?? '';
-		$options['password'] = $options['password'] ?? '';
-		$options['database'] = $options['database'] ?? '';
-		$options['select']   = isset($options['select']) ? (bool) $options['select'] : true;
-		$options['trust_certificate'] = $options['trust_certificate'] ?? false;
+		$options['host']              = $options['host'] ?? 'localhost';
+		$options['user']              = $options['user'] ?? '';
+		$options['password']          = $options['password'] ?? '';
+		$options['database']          = $options['database'] ?? '';
+		$options['select']            = isset($options['select']) ? (bool) $options['select'] : true;
+		$options['trust_certificate'] = isset($options['trust_certificate']) ? (bool) $options['trust_certificate'] : false;
 
 		// Finalize initialisation
 		parent::__construct($options);
@@ -116,12 +116,12 @@ public function connect()
 
 		// Build the connection configuration array.
 		$config = [
-			'Database'             => $this->options['database'],
-			'uid'                  => $this->options['user'],
-			'pwd'                  => $this->options['password'],
+			'Database'               => $this->options['database'],
+			'uid'                    => $this->options['user'],
+			'pwd'                    => $this->options['password'],
+			'CharacterSet'           => 'UTF-8',
+			'ReturnDatesAsStrings'   => true,
 			'TrustServerCertificate' => $this->options['trust_certificate'],
-			'CharacterSet'         => 'UTF-8',
-			'ReturnDatesAsStrings' => true,
 		];
 
 		// Attempt to connect to the server.