4 files changed, 11 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index c7afa3f..b76d5b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ FROM archlinux:latest
 RUN mkdir /app
 WORKDIR /app
 ADD static /app/static
+ADD easybridge.jpg /app/easybridge.jpg
 ADD easybridge /app/easybridge
 ADD templates /app/templates
 
diff --git a/main.go b/main.go
index e6c3f82..d25a3d6 100644
--- a/main.go
+++ b/main.go
@@ -25,6 +25,7 @@ type ConfigFile struct {
 	DbPath       string `json:"db_path"`
 	MatrixDomain string `json:"matrix_domain"`
 	SessionKey   string `json:"web_session_key"`
+	AvatarFile   string `json:"easybridge_avatar"`
 }
 
 var configFlag = flag.String("config", "./config.json", "Configuration file path")
@@ -44,6 +45,7 @@ func readConfig() ConfigFile {
 		Server:       "http://localhost:8008",
 		DbType:       "sqlite3",
 		DbPath:       "easybridge.db",
+		AvatarFile:   "./easybridge.jpg",
 		SessionKey:   hex.EncodeToString(defaultKey),
 	}
 
@@ -166,7 +168,11 @@ func main() {
 
 	// Start appservice and web management interface
 	errch := make(chan error)
-	StartAppService(errch)
+	err = StartAppService(errch)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	StartWeb(errch)
 
 	// Wait for an error somewhere
diff --git a/server.go b/server.go
index e914f3b..f11615e 100644
--- a/server.go
+++ b/server.go
@@ -30,7 +30,7 @@ func StartAppService(errch chan error) error {
 	if err == nil {
 		// If Easybridge account was created, update avatar and display name
 		err = mx.ProfileAvatar(ezbrMxId(), &connector.FileMediaObject{
-			Path: "easybridge.jpg",
+			Path: config.AvatarFile,
 		})
 		if err != nil {
 			return err
diff --git a/util.go b/util.go
index c8a62ef..5d86b8a 100644
--- a/util.go
+++ b/util.go
@@ -58,11 +58,11 @@ func ezbrSystemSendf(user_mx_id string, format string, args ...interface{}) {
 // ----
 
 func roomAlias(protocol string, id RoomID) string {
-	return fmt.Sprintf("_ezbr__%s__%s", safeStringForId(string(id)), protocol)
+	return fmt.Sprintf("%s_%s__%s", registration.SenderLocalpart, safeStringForId(string(id)), protocol)
 }
 
 func userMxId(protocol string, id UserID) string {
-	return fmt.Sprintf("_ezbr__%s__%s", safeStringForId(string(id)), protocol)
+	return fmt.Sprintf("%s_%s__%s", registration.SenderLocalpart, safeStringForId(string(id)), protocol)
 }
 
 func safeStringForId(in string) string {