diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 1c828267..420478dc 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -65,11 +65,12 @@ $(function() {
     });
 });
 
-/*function TableActions (value, row, index) {
+/* Function for deleting domain restrictions */
+function TableActions (value, row, index) {
     return [
         "<a class=\"danger remove\" data-toggle=\"modal\" data-target=\"#DeleteDomain\" data-domain-id=\"" + row.id
         + "\" title=\"Remove\">",
         "<i class=\"glyphicon glyphicon-trash\"></i>",
         "</a>"
     ].join("");
-}*/
+}
diff --git a/cps/worker.py b/cps/worker.py
index 65d4a850..2cc2b337 100644
--- a/cps/worker.py
+++ b/cps/worker.py
@@ -468,9 +468,9 @@ class WorkerThread(threading.Thread):
         except (MemoryError) as e:
             self._handleError(u'Error sending email: ' + e.message)
             return None
-        except (smtplib.SMTPException) as e:
+        except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
             if hasattr(e, "smtp_error"):
-                text = e.smtp_error.replace("\n",'. ')
+                text = e.smtp_error.decode('utf-8').replace("\n",'. ')
             elif hasattr(e, "message"):
                 text = e.message
             else:
@@ -495,7 +495,6 @@ class WorkerThread(threading.Thread):
 
     def _handleError(self, error_message):
         web.app.logger.error(error_message)
-        # self.queue[self.current]['status'] = STAT_FAIL
         self.UIqueue[self.current]['stat'] = STAT_FAIL
         self.UIqueue[self.current]['progress'] = "100 %"
         self.UIqueue[self.current]['runtime'] = self._formatRuntime(
@@ -503,7 +502,6 @@ class WorkerThread(threading.Thread):
         self.UIqueue[self.current]['message'] = error_message
 
     def _handleSuccess(self):
-        # self.queue[self.current]['status'] = STAT_FINISH_SUCCESS
         self.UIqueue[self.current]['stat'] = STAT_FINISH_SUCCESS
         self.UIqueue[self.current]['progress'] = "100 %"
         self.UIqueue[self.current]['runtime'] = self._formatRuntime(