diff --git a/fda-broker-service/Dockerfile b/fda-broker-service/Dockerfile
index 5e548a47627dbc9d6daab85aced4ba90b787e53a..b546dd11299ad83751461c33a6338cf3080151a7 100644
--- a/fda-broker-service/Dockerfile
+++ b/fda-broker-service/Dockerfile
@@ -15,7 +15,7 @@ RUN apk --no-cache add python3 py3-pip
 COPY ./requirements.txt ./requirements.txt
 RUN pip3 install -r ./requirements.txt
 
-COPY init.py ./init.py
+COPY ./init.py ./init.py
 
 EXPOSE 15692
 
diff --git a/fda-broker-service/docker-entrypoint.sh b/fda-broker-service/docker-entrypoint.sh
index 915c666e8864ef41ffdbab51de5aba376eacc242..b7948e7f74cd17bd9ca356ac148bf3b48ba8e17e 100755
--- a/fda-broker-service/docker-entrypoint.sh
+++ b/fda-broker-service/docker-entrypoint.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
-rabbitmq-server &
 
 # enable prometheus plugin
-sleep 10 && rabbitmq-plugins enable rabbitmq_prometheus
+(sleep 10; rabbitmq-plugins enable rabbitmq_prometheus) &
 
 # register with discovery service
-python3 ./init.py
\ No newline at end of file
+python3 ./init.py
+(while sleep 60; do python3 ./init.py; done) &
+
+rabbitmq-server
\ No newline at end of file
diff --git a/fda-broker-service/init.py b/fda-broker-service/init.py
index 06be12db340312dae50804679ca52ec05601b235..9d5b022d7e2e55c9952e856a651818438b395da1 100644
--- a/fda-broker-service/init.py
+++ b/fda-broker-service/init.py
@@ -1,22 +1,24 @@
 from py_eureka_client import eureka_client
 import py_eureka_client.logger as logger
-from time import sleep
+import datetime
 
 logger.set_level("ERROR")
-print("Registering at discovery service ...")
 
 
-def register(first=False):
-    eureka_client.init(eureka_server="http://discovery-service:9090/eureka/", app_name="broker-service",
+def register():
+    eureka_client.init(eureka_server="http://discovery-service:9090/eureka/",
+                       app_name="broker-service",
                        instance_ip="broker-service",
                        instance_host="broker-service",
                        instance_port=15672)
-    if first:
-        print("Service was registered at Eureka server")
+    log("Service registered")
+
+
+def log(message):
+    date = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    print(f"{date} LOG: {message}")
 
 
 if __name__ == "__main__":
-    register(first=True)
-    while True:
-        register()
-        sleep(60)
+    log("Registering at discovery service ...")
+    register()
diff --git a/fda-ui/layouts/default.vue b/fda-ui/layouts/default.vue
index 9023fb63f276462d5b49ede81b48dc7a51d60592..63c821f9eed411adbe629b3af998f1f07b0c4cd0 100644
--- a/fda-ui/layouts/default.vue
+++ b/fda-ui/layouts/default.vue
@@ -75,7 +75,7 @@
         v-if="!token"
         class="mr-2"
         color="secondary"
-        to="/login">
+        @click="login">
         <v-icon left>mdi-login</v-icon> Login
       </v-btn>
       <v-btn
@@ -262,6 +262,10 @@ export default {
         subtitle: item.item.description
       }
     },
+    login () {
+      let redirect = ![undefined ,'/', '/login'].includes(this.$router.currentRoute.path)
+      this.$router.push({ path: '/login', query: redirect ? { redirect: this.$router.currentRoute.path } : {}})
+    },
     navigate (item) {
       this.$router.push(this.metadata(item).link)
     },
diff --git a/fda-ui/pages/login.vue b/fda-ui/pages/login.vue
index 07539ffc0f51a7b1766c21b04db7cec1b7bd1371..b9b82425b216eb84ac34d9bedfbdef1765e72778 100644
--- a/fda-ui/pages/login.vue
+++ b/fda-ui/pages/login.vue
@@ -96,7 +96,7 @@ export default {
         delete user.token
         this.$store.commit('SET_USER', user)
         this.$toast.success('Welcome back!')
-        this.$router.push('/container')
+        this.$router.push(this.$route.query.redirect ?  this.$route.query.redirect : '/container')
       } catch (err) {
         if (err.response !== undefined && err.response.status !== undefined) {
           if (err.response.status === 418) {