diff --git a/.gitignore b/.gitignore
index 94695ea..001ab3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-.vagrant/
\ No newline at end of file
+.vagrant/
+.idea
+
+key.pem
diff --git a/html/befuncs/snips.php b/html/befuncs/snips.php
index fb858af..e52a328 100644
--- a/html/befuncs/snips.php
+++ b/html/befuncs/snips.php
@@ -28,9 +28,15 @@ function genNavBar(){
 		<nav id="main_nav">
 			<div>
 				<?php
+					$uri = array_key_exists('redirect_to',$_GET) ?
+                        $_GET['redirect_to'] :
+                        $_SERVER['REQUEST_URI'];
+					$params = http_build_query(array(
+						'redirect_to' => $uri,
+					));
 					//TODO: replace login btn with account btn when logged in
 					if($_SESSION['userid']==0){
-						echo '<a href="/login/" class="btn" id="loginbtn">Login</a>';
+						echo '<a href="/login/?' . $params . '" class="btn" id="loginbtn">Login</a>';
 					}else{
 						echo '<a href="/login/" class="btn" id="loginbtn">Logout</a>';
 						
diff --git a/html/login/index.php b/html/login/index.php
index dea37d5..8eb187c 100644
--- a/html/login/index.php
+++ b/html/login/index.php
@@ -10,7 +10,18 @@
 	if(	array_key_exists('user',$_POST)
 	&&	array_key_exists('passwd',$_POST) ){
 		$login_result = $db->login($_POST['user'],$_POST['passwd']);
-		if(!$login_result){
+		if($login_result){
+			if(array_key_exists('redirect_to', $_POST)){
+				$url = parse_url($_POST['redirect_to']);
+				if(is_array($url)){
+					$uri = $url['path'] . '?' . $url['query'] . '#' . $url['fragment'];
+					header('Location: ' . $uri, true, 303);
+					die();
+				}
+			}
+			header('Location: /login/');
+			die();
+		}else{
 			$username_cache = $_POST['user'];
 			$passwd_cache = $_POST['passwd'];
 		}