diff --git a/.github/workflows/manual-deploy-obscuro-gateway-database.yml b/.github/workflows/manual-deploy-obscuro-gateway-database.yml
index a2c7b566bb..8ab3b8ebaa 100644
--- a/.github/workflows/manual-deploy-obscuro-gateway-database.yml
+++ b/.github/workflows/manual-deploy-obscuro-gateway-database.yml
@@ -117,4 +117,6 @@ jobs:
                 -e MARIADB_USER=obscurouser \
                 -e MARIADB_PASSWORD=${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }} \
                 -v /home/obscuro/go-obscuro/tools/walletextension/storage/database/001_init.sql:/docker-entrypoint-initdb.d/schema.sql \
-                mariadb:11.1.2-jammy'
+                mariadb:11.1.2-jammy \
+                --max_password_errors=2'
+
diff --git a/integration/manualtests/connection_test.go b/integration/manualtests/connection_test.go
new file mode 100644
index 0000000000..d7ba3d5f6a
--- /dev/null
+++ b/integration/manualtests/connection_test.go
@@ -0,0 +1,129 @@
+package manualtests
+
+import (
+	"context"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/obscuronet/go-obscuro/tools/walletextension/common"
+	"github.com/stretchr/testify/require"
+	"github.com/valyala/fasthttp"
+
+	gethcommon "github.com/ethereum/go-ethereum/common"
+)
+
+func TestSubscribeToOG(t *testing.T) {
+	t.Skip("skip manual tests")
+
+	// Using http
+	ogHTTPAddress := "https://dev-testnet.obscu.ro:443"
+	ogWSAddress := "wss://dev-testnet.obscu.ro:81"
+	// ogWSAddress := "ws://51.132.131.47:81"
+
+	// join the network
+	statusCode, userID, err := fasthttp.Get(nil, fmt.Sprintf("%s/v1/join/", ogHTTPAddress))
+	require.NoError(t, err) // dialing to the given TCP address timed out
+	fmt.Println(statusCode)
+	fmt.Println(userID)
+
+	// sign the message
+	messagePayload := signMessage(string(userID))
+
+	// register an account
+	var regAccountResp []byte
+	regAccountResp, err = registerAccount(ogHTTPAddress, string(userID), messagePayload)
+	require.NoError(t, err)
+	fmt.Println(string(regAccountResp))
+	fmt.Println(hex.EncodeToString(regAccountResp))
+
+	// Using WS ->
+
+	// Connect to WebSocket server using the standard geth client
+	client, err := ethclient.Dial(ogWSAddress)
+	require.NoError(t, err)
+
+	// Create a simple request
+	at, err := client.BalanceAt(context.Background(), l2Wallet.Address(), nil)
+	require.NoError(t, err)
+
+	fmt.Println("Balance for account ", l2Wallet.Address().Hex(), " - ", at.String())
+
+	// Create a subscription
+	query := ethereum.FilterQuery{
+		Addresses: []gethcommon.Address{l2Wallet.Address()},
+	}
+
+	logs := make(chan types.Log)
+	sub, err := client.SubscribeFilterLogs(context.Background(), query, logs)
+	if err != nil {
+		log.Fatalf("Failed to subscribe: %v", err)
+	}
+	defer sub.Unsubscribe()
+
+	// Listen for events from the contract
+	for {
+		select {
+		case err := <-sub.Err():
+			log.Fatalf("Subscription error: %v", err)
+		case vLog := <-logs:
+			// Process the contract event
+			// This is just a simple example printing the block number; you'll want to decode and handle the logs according to your contract's ABI
+			log.Printf("Received log in block number: %v", vLog.BlockNumber)
+		}
+	}
+}
+
+func registerAccount(baseAddress, userID, payload string) ([]byte, error) {
+	req, err := http.NewRequestWithContext(
+		context.Background(),
+		http.MethodPost,
+		baseAddress+"/v1/authenticate/?u="+userID,
+		strings.NewReader(payload),
+	)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Content-Type", "application/json; charset=UTF-8")
+
+	client := &http.Client{}
+	response, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer response.Body.Close()
+	return io.ReadAll(response.Body)
+}
+
+//	{
+//	 "signature": "0xc784adea83ed3ec60528f4747418c85abe553b35a47fd2c95425de654bb9d0d40ede24aec182e6a2ec65c0c7c6aedab7823f21a9b9f7ff5db3a77a9f90dc97b41c",
+//	 "message": "Register e097c4a10d4285d13b377985834b4c57e069b5856cc6c2cd4a038f62da4bc459 for 0x06ed49a32fcc5094abee51a4ffd46dd23b62a191"
+//	}
+func signMessage(userID string) string {
+	pk := l2Wallet.PrivateKey()
+	address := l2Wallet.Address()
+	hexAddress := address.Hex()
+
+	message := fmt.Sprintf("Register %s for %s", userID, strings.ToLower(hexAddress))
+	prefixedMessage := fmt.Sprintf(common.PersonalSignMessagePrefix, len(message), message)
+
+	messageHash := crypto.Keccak256([]byte(prefixedMessage))
+	sig, err := crypto.Sign(messageHash, pk)
+	if err != nil {
+		log.Fatalf("Failed to sign message: %v", err)
+	}
+	sig[64] += 27
+	signature := "0x" + hex.EncodeToString(sig)
+	payload := fmt.Sprintf("{\"signature\": \"%s\", \"message\": \"%s\"}", signature, message)
+	fmt.Println(payload)
+	return payload
+}
diff --git a/tools/walletextension/userconn/user_conn.go b/tools/walletextension/userconn/user_conn.go
index b40e0ed28e..e2d2790883 100644
--- a/tools/walletextension/userconn/user_conn.go
+++ b/tools/walletextension/userconn/user_conn.go
@@ -57,9 +57,9 @@ func NewUserConnWS(resp http.ResponseWriter, req *http.Request, logger gethlog.L
 	// We search all the request's headers. If there's a websocket upgrade header, we upgrade to a websocket connection.
 	conn, err := upgrader.Upgrade(resp, req, nil)
 	if err != nil {
-		err = fmt.Errorf("unable to upgrade to websocket connection")
-		logger.Error("unable to upgrade to websocket connection")
-		httpLogAndSendErr(resp, err.Error()) // todo (@ziga) - Handle error properly for websockets.
+		err = fmt.Errorf("unable to upgrade to websocket connection - %w", err)
+		logger.Error("unable to upgrade to websocket connection", log.ErrKey, err)
+		httpLogAndSendErr(resp, err.Error())
 		return nil, err
 	}
 
@@ -91,7 +91,7 @@ func (h *userConnHTTP) WriteResponse(msg []byte) error {
 }
 
 func (h *userConnHTTP) HandleError(msg string) {
-	h.logger.Error(msg)
+	h.logger.Error(fmt.Sprintf("Handling HTTP user error - %s", msg))
 	httpLogAndSendErr(h.resp, msg)
 }
 
@@ -139,7 +139,7 @@ func (w *userConnWS) WriteResponse(msg []byte) error {
 
 // HandleError logs and prints the error, and writes it to the websocket as a JSON object with a single key, "error".
 func (w *userConnWS) HandleError(msg string) {
-	w.logger.Error(msg)
+	w.logger.Error(fmt.Sprintf("Handling WS user error - %s", msg))
 
 	errMsg, err := json.Marshal(map[string]interface{}{
 		common.JSONKeyErr: msg,