diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index 2c5d27b48..1365d8387 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -115,7 +115,7 @@ class Notifier implements INotifier {
 						]
 					]
 				);
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . '');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'card-overdue':
 				$cardId = $notification->getObjectId();
@@ -123,7 +123,7 @@ class Notifier implements INotifier {
 				$notification->setParsedSubject(
 					(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
 				);
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . '');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'card-comment-mentioned':
 				$cardId = $notification->getObjectId();
@@ -150,7 +150,7 @@ class Notifier implements INotifier {
 				if ($notification->getMessage() === '{message}') {
 					$notification->setParsedMessage($notification->getMessageParameters()['message']);
 				}
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . '');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'board-shared':
 				$boardId = $notification->getObjectId();
diff --git a/src/router.js b/src/router.js
index 285cf93d4..e1bd1c81e 100644
--- a/src/router.js
+++ b/src/router.js
@@ -42,7 +42,7 @@ export default new Router({
 			component: Boards,
 		},
 		{
-			path: '/boards',
+			path: '/board',
 			name: 'boards',
 			component: Boards,
 			props: {
@@ -50,7 +50,7 @@ export default new Router({
 			},
 		},
 		{
-			path: '/boards/archived',
+			path: '/board/archived',
 			name: 'boards.archived',
 			component: Boards,
 			props: {
@@ -58,7 +58,7 @@ export default new Router({
 			},
 		},
 		{
-			path: '/boards/shared',
+			path: '/board/shared',
 			name: 'boards.shared',
 			component: Boards,
 			props: {
@@ -66,7 +66,7 @@ export default new Router({
 			},
 		},
 		{
-			path: '/boards/:id',
+			path: '/board/:id',
 			name: 'board',
 			components: {
 				default: Board,
@@ -101,7 +101,7 @@ export default new Router({
 					},
 				},
 				{
-					path: 'cards/:cardId',
+					path: 'card/:cardId',
 					name: 'card',
 					components: {
 						sidebar: CardSidebar,